xserver: Branch 'master'

[Keith Packard]

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

New commits:
commit 0de7cec90738a7a5020150309866bb0e23b6f479
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Thu May 19 15:36:29 2011 +1000

    xfree86: bump to video ABI 11
    
    We've broken the ABI with some commit and drivers built against ABI 10
    happily segfault now.
    
    (The relevant patch is 51f353d0a0d116af16d7d9590cadef6c56328746 which
    changed the ATOM typedef from unsigned long to uint32_t, thanks to
    Cyril Brulebois <kibi at debian.org>  for figuring this out)
    
    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 581047d..94f17e9 100644
--- a/hw/xfree86/common/xf86Module.h
+++ b/hw/xfree86/common/xf86Module.h
@@ -82,7 +82,7 @@ typedef enum {
  * mask is 0xFFFF0000.
  */
 #define ABI_ANSIC_VERSION	SET_ABI_VERSION(0, 4)
-#define ABI_VIDEODRV_VERSION	SET_ABI_VERSION(10, 0)
+#define ABI_VIDEODRV_VERSION	SET_ABI_VERSION(11, 0)
 #define ABI_XINPUT_VERSION	SET_ABI_VERSION(12, 2)
 #define ABI_EXTENSION_VERSION	SET_ABI_VERSION(5, 0)
 #define ABI_FONT_VERSION	SET_ABI_VERSION(0, 6)