summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichel Dänzer <michel@tungstengraphics.com>2007-01-23 10:15:22 +0100
committerKeith Packard <keithp@neko.keithp.com>2007-03-26 20:41:14 -0700
commit4fd2d3aedfae838940d61598466f89fdb47b1557 (patch)
treed6be98f1d73430dffb68905fda6b99edab636013
parentdc914ced69e1e619a944c7dcb940c25e195cd4f3 (diff)
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.
-rw-r--r--hw/xfree86/common/xf86Module.h2
1 files changed, 1 insertions, 1 deletions
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)