From 4fd2d3aedfae838940d61598466f89fdb47b1557 Mon Sep 17 00:00:00 2001 From: Michel Dänzer Date: Tue, 23 Jan 2007 10:15:22 +0100 Subject: Bump video driver ABI version to 1.2. This is necessary because server-1.2-branch bumped to 1.1 for xf86CVTMode and we have xf86XVFillKeyHelperDrawable on top of that. (cherry picked from commit 788cfce911793a26aed16f38f30678ecee82c873) Conflicts: hw/xfree86/common/xf86Module.h Avoid picking up XInput ABI change. --- hw/xfree86/common/xf86Module.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h index edae6f297..e54d9bea8 100644 --- a/hw/xfree86/common/xf86Module.h +++ b/hw/xfree86/common/xf86Module.h @@ -84,7 +84,7 @@ typedef enum { * mask is 0xFFFF0000. */ #define ABI_ANSIC_VERSION SET_ABI_VERSION(0, 3) -#define ABI_VIDEODRV_VERSION SET_ABI_VERSION(1, 1) +#define ABI_VIDEODRV_VERSION SET_ABI_VERSION(1, 2) #define ABI_XINPUT_VERSION SET_ABI_VERSION(0, 7) #define ABI_EXTENSION_VERSION SET_ABI_VERSION(0, 3) #define ABI_FONT_VERSION SET_ABI_VERSION(0, 5) -- cgit v1.2.3