xserver: Branch 'master'

[Aaron Plattner]

 hw/xfree86/common/xf86Module.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree 5257b32e492bd2082bef6a4cd0fea03ce093c0f8 (from 73fdc16bc4f4e21ff604b3f9ded23b40398fb1b6)
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Wed Mar 28 15:51:24 2007 -0700

    Bump video driver ABI to 2.0 for cw change (commit 6ed08949af4f7ac09170d3d9581e4092b24a84ee).

diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h
index 2811839..8e644c4 100644
--- a/hw/xfree86/common/xf86Module.h
+++ b/hw/xfree86/common/xf86Module.h
@@ -84,7 +84,7 @@ typedef enum {
  * mask is 0xFFFF0000.
  */
 #define ABI_ANSIC_VERSION	SET_ABI_VERSION(0, 3)
-#define ABI_VIDEODRV_VERSION	SET_ABI_VERSION(1, 2)
+#define ABI_VIDEODRV_VERSION	SET_ABI_VERSION(2, 0)
 #define ABI_XINPUT_VERSION	SET_ABI_VERSION(1, 0)
 #define ABI_EXTENSION_VERSION	SET_ABI_VERSION(0, 3)
 #define ABI_FONT_VERSION	SET_ABI_VERSION(0, 5)