summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2011-06-28 10:37:53 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2011-06-28 10:37:53 +1000
commitf0158bd0eb8efe2e051bb00d98d17b6071224062 (patch)
tree515dd8e001326dc46060e2637c24d62df54fc53f
parent6658e9ad22923e8bb90ff84c079e870a8e416976 (diff)
Require server 1.10 instead of manual ABI checks
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--configure.ac2
-rw-r--r--src/xf86PM.c4
2 files changed, 1 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac
index 8ad433b..c0b3685 100644
--- a/configure.ac
+++ b/configure.ac
@@ -64,7 +64,7 @@ XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
XORG_DRIVER_CHECK_EXT(XINPUT, inputproto)
# Checks for pkg-config packages
-PKG_CHECK_MODULES(XORG, [xorg-server >= 1.9.99] xproto $REQUIRED_MODULES)
+PKG_CHECK_MODULES(XORG, [xorg-server >= 1.10] xproto $REQUIRED_MODULES)
# Define an Automake variable for the driver name
DRIVER_NAME=penmount
diff --git a/src/xf86PM.c b/src/xf86PM.c
index 8d7539e..edcf6f8 100644
--- a/src/xf86PM.c
+++ b/src/xf86PM.c
@@ -57,10 +57,6 @@
#define TS_Raw 60
#define TS_Scaled 61
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
-#error "Need server with input ABI 12"
-#endif
-
/*
* Be sure to set vmin appropriately for your device's protocol. You want to
* read a full packet before returning