xserver: Branch 'master'

[Keith Packard]

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

New commits:
commit 42a4873cc7fe0c7a729e48f806e877c4dac5c07f
Author: Keith Packard <keithp at keithp.com>
Date:   Wed Apr 30 09:32:29 2014 -0700

    hw/xfree86: Video Driver ABI version 18.0
    
    With the change in the cursor interface in
    4c3932620c29c91dfbbc8eb09c84efcaa7ec873e, we need to bump the video
    driver ABI number to ensure that drivers are rebuilt to match the new
    interface.
    
    Signed-off-by: Keith Packard <keithp at keithp.com>
    Reviewed-by: Aaron Plattner <aplattner at nvidia.com>

diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h
index 62ac95d..b848f53 100644
--- a/hw/xfree86/common/xf86Module.h
+++ b/hw/xfree86/common/xf86Module.h
@@ -80,7 +80,7 @@ typedef enum {
  * mask is 0xFFFF0000.
  */
 #define ABI_ANSIC_VERSION	SET_ABI_VERSION(0, 4)
-#define ABI_VIDEODRV_VERSION	SET_ABI_VERSION(17, 0)
+#define ABI_VIDEODRV_VERSION	SET_ABI_VERSION(18, 0)
 #define ABI_XINPUT_VERSION	SET_ABI_VERSION(21, 0)
 #define ABI_EXTENSION_VERSION	SET_ABI_VERSION(8, 0)
 #define ABI_FONT_VERSION	SET_ABI_VERSION(0, 6)