summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@sun.com>2007-09-07 10:14:14 -0700
committerAlan Coopersmith <alan.coopersmith@sun.com>2007-09-07 10:14:14 -0700
commita7295991a74b725a27efb1ed07ba4e396374b288 (patch)
treec7adeac89159176aeda181c61a1c02f147f5fa91
parent75aca9fa1429ca9e2aa696c32cb77ca12d8c7856 (diff)
Move from TSCalibrationCtl to AbsCalibCtl - requires inputproto >= 1.4.1
Based on xf86-input-dmc commit 43a05fb4cb02f15fc91d0909a3cab37a9de6b622 by Daniel Stone.
-rw-r--r--configure.ac2
-rw-r--r--src/citron.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 3ce3686..9d8bdf0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -72,7 +72,7 @@ AC_SUBST(inputdir)
# Checks for extensions
XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
-XORG_DRIVER_CHECK_EXT(XINPUT, inputproto)
+XORG_DRIVER_CHECK_EXT(XINPUT, [inputproto >= 1.4.1])
# Checks for pkg-config packages
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto $REQUIRED_MODULES)
diff --git a/src/citron.c b/src/citron.c
index 7b1021d..42152b5 100644
--- a/src/citron.c
+++ b/src/citron.c
@@ -2020,7 +2020,7 @@ static void cit_ProcessPacket(cit_PrivatePtr priv)
static int
ControlProc (LocalDevicePtr local, xDeviceCtl * control)
{
- xDeviceTSCalibrationCtl *c = (xDeviceTSCalibrationCtl *) control;
+ xDeviceAbsCalibCtl *c = (xDeviceAbsCalibCtl *) control;
cit_PrivatePtr priv = (cit_PrivatePtr) (local->private);
DBG(5, ErrorF("%sControlProc called\n", CI_INFO));