xserver: Branch 'master'

[Keith Packard]

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

New commits:
commit e4582d9e5c8649347742a13eae68cf27005296fc
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Thu May 27 10:42:54 2010 -0400

    xfree86: bump ABI_XINPUT_VERSION to 11.
    
    commit c2d0b3b437b7ce6ce975f2ead4d8bb8295ef0ddc
    "xfree86: store the InputAttributes in the input device."
    introduced the new API. Bump the input version so drivers can handle this
    appropriately.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h
index d61758f..51b9b16 100644
--- a/hw/xfree86/common/xf86Module.h
+++ b/hw/xfree86/common/xf86Module.h
@@ -83,7 +83,7 @@ typedef enum {
  */
 #define ABI_ANSIC_VERSION	SET_ABI_VERSION(0, 4)
 #define ABI_VIDEODRV_VERSION	SET_ABI_VERSION(8, 0)
-#define ABI_XINPUT_VERSION	SET_ABI_VERSION(10, 0)
+#define ABI_XINPUT_VERSION	SET_ABI_VERSION(11, 0)
 #define ABI_EXTENSION_VERSION	SET_ABI_VERSION(4, 0)
 #define ABI_FONT_VERSION	SET_ABI_VERSION(0, 6)