summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2011-06-27 14:47:32 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2011-06-27 14:47:32 +1000
commit6c9a801a5c1d7e694ff7f4f097599f2b96357982 (patch)
tree0030f0ab6b546b163835bafe4bfc9dbd35a8f1c7
parent6fd22a9d64f07a480d177e877189a3a3ebf7cb90 (diff)
Require server 1.10
And remove the manual input ABI check. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--configure.ac2
-rw-r--r--src/xf86Elo.c4
2 files changed, 1 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac
index 0d881e6..9fd1fc6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -58,7 +58,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.0] xproto $REQUIRED_MODULES)
+PKG_CHECK_MODULES(XORG, [xorg-server >= 1.10.0] xproto $REQUIRED_MODULES)
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
XORG_CFLAGS="$CWARNFLAGS $XORG_CFLAGS"
diff --git a/src/xf86Elo.c b/src/xf86Elo.c
index f5b31d7..5aba02f 100644
--- a/src/xf86Elo.c
+++ b/src/xf86Elo.c
@@ -58,10 +58,6 @@
#include "xf86Module.h"
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
-#error "Need server with input ABI 12."
-#endif
-
/**
* models to be treated specially.
*/