--- src/citron.c.orig	2009-03-31 10:03:43.488190347 +0200
+++ src/citron.c	2009-03-31 10:04:10.319451665 +0200
@@ -305,7 +305,7 @@ static XF86ModuleVersionInfo VersionRec 
 	MODULEVENDORSTRING,			/* vendor specific string */
 	MODINFOSTRING1,				
 	MODINFOSTRING2,
-	XF86_VERSION_CURRENT,		/* Current XFree version */
+	XORG_VERSION_CURRENT,		/* Current XFree version */
 	CITOUCH_VERSION_MAJOR,		/* Module-specific major version */
 	CITOUCH_VERSION_MINOR,		/* Module-specific minor version */
 	CITOUCH_VERSION_PATCH,		/* Module-specific patch level */
@@ -1368,8 +1368,7 @@ DeviceInit (DeviceIntPtr dev)
 	 * screen to fit one meter.
 	 * Device may reports touch pressure on the 3rd axis.
 	 */
-	if (InitValuatorClassDeviceStruct (dev, 2, xf86GetMotionEvents,
-									local->history_size, Absolute) == FALSE)
+	if (InitValuatorClassDeviceStruct (dev, 2, local->history_size, Absolute) == FALSE)
 	{
 		ErrorF ("%sUnable to allocate Citron touchscreen ValuatorClassDeviceStruct\n", CI_ERROR);
 		return !Success;