xserver: Branch 'master'

[Eamon Walsh]

 hw/xfree86/common/xf86Module.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a2df51f8e95a814c54b806814020155ac8bd177d
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date:   Fri Dec 14 00:53:54 2007 -0500

    Bump video driver ABI and extension ABI for devPrivates rework.

diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h
index 852e51f..240155c 100644
--- a/hw/xfree86/common/xf86Module.h
+++ b/hw/xfree86/common/xf86Module.h
@@ -83,9 +83,9 @@ typedef enum {
  * mask is 0xFFFF0000.
  */
 #define ABI_ANSIC_VERSION	SET_ABI_VERSION(0, 3)
-#define ABI_VIDEODRV_VERSION	SET_ABI_VERSION(3, 0)
+#define ABI_VIDEODRV_VERSION	SET_ABI_VERSION(4, 0)
 #define ABI_XINPUT_VERSION	SET_ABI_VERSION(2, 0)
-#define ABI_EXTENSION_VERSION	SET_ABI_VERSION(0, 3)
+#define ABI_EXTENSION_VERSION	SET_ABI_VERSION(1, 0)
 #define ABI_FONT_VERSION	SET_ABI_VERSION(0, 5)
 
 #define MODINFOSTRING1	0xef23fdc5