xserver: Branch 'server-1.11-branch'

[Jeremy Huddleston]

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

New commits:
commit 4ad271d06c5aa42721c0e2e01e17e34a39825c65
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Mon Aug 29 20:44:18 2011 -0700

    xfree86: Bump extension ABI version to 6.0
    
    The video driver ABI was bumped to 11.0 in commit
    0de7cec90738a7a5020150309866bb0e23b6f479 because of a change to the
    size of ATOM in commit 51f353d0a0d116af16d7d9590cadef6c56328746.  This
    also affects extension modules, so the extension ABI version should
    have been bumped too.
    
    Signed-off-by: Aaron Plattner <aplattner at nvidia.com>
    Reviewed-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 2a5c805..3038c04 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(11, 0)
 #define ABI_XINPUT_VERSION	SET_ABI_VERSION(13, 0)
-#define ABI_EXTENSION_VERSION	SET_ABI_VERSION(5, 0)
+#define ABI_EXTENSION_VERSION	SET_ABI_VERSION(6, 0)
 #define ABI_FONT_VERSION	SET_ABI_VERSION(0, 6)
 
 #define MODINFOSTRING1	0xef23fdc5