xserver: Branch 'master'

[Adam Jackson]

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

New commits:
commit 3f9507ed2f7246b2c8cf2bbc430cc99c5f35c92a
Author: Adam Jackson <ajax at redhat.com>
Date:   Thu Feb 9 13:53:41 2017 -0500

    xfree86: Bump video ABI to 24.0
    
    c02f6a68 changed the layout of xf86CrtcFuncs.
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>

diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h
index a3b2c93..dd4d5f9 100644
--- a/hw/xfree86/common/xf86Module.h
+++ b/hw/xfree86/common/xf86Module.h
@@ -74,7 +74,7 @@
  * mask is 0xFFFF0000.
  */
 #define ABI_ANSIC_VERSION	SET_ABI_VERSION(0, 4)
-#define ABI_VIDEODRV_VERSION	SET_ABI_VERSION(23, 0)
+#define ABI_VIDEODRV_VERSION	SET_ABI_VERSION(24, 0)
 #define ABI_XINPUT_VERSION	SET_ABI_VERSION(24, 1)
 #define ABI_EXTENSION_VERSION	SET_ABI_VERSION(10, 0)