xserver: Branch 'master'

[Carl Worth]

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

New commits:
commit e4335e876d254e446a965259e845ad955da5b5c2
Author: root <root at samich.home.cworth.org>
Date:   Mon Jun 30 15:29:04 2008 -0700

    Revert "XInput ABI is 2.1, not 3.1."
    
    This reverts commit 76576c87b0de106e006d1cfa59d42d3a483e966c.
    which was an incorrect revert of previous ABI bumps. Those
    responsible for the accidental ABI bumps in both directions
    have all been sacked.
    
    This allows xf86-input-mouse to build again, for example.

diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h
index 5ce6e8a..fdcd567 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(2, 1)
+#define ABI_XINPUT_VERSION	SET_ABI_VERSION(3, 1)
 #define ABI_EXTENSION_VERSION	SET_ABI_VERSION(1, 1)
 #define ABI_FONT_VERSION	SET_ABI_VERSION(0, 6)