xserver: Branch 'server-1.5-branch'

[Adam Jackson]

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

New commits:
commit bee463bd8a991ef7ba619241237cd06d2fc92558
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Jun 30 16:10:37 2008 -0400

    XInput ABI is 2.1, not 3.1.
    (cherry picked from commit 76576c87b0de106e006d1cfa59d42d3a483e966c)

diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h
index fdcd567..5ce6e8a 100644
--- a/hw/xfree86/common/xf86Module.h
+++ b/hw/xfree86/common/xf86Module.h
@@ -84,7 +84,7 @@ typedef enum {
  */
 #define ABI_ANSIC_VERSION	SET_ABI_VERSION(0, 4)
 #define ABI_VIDEODRV_VERSION	SET_ABI_VERSION(4, 1)
-#define ABI_XINPUT_VERSION	SET_ABI_VERSION(3, 1)
+#define ABI_XINPUT_VERSION	SET_ABI_VERSION(2, 1)
 #define ABI_EXTENSION_VERSION	SET_ABI_VERSION(1, 1)
 #define ABI_FONT_VERSION	SET_ABI_VERSION(0, 6)