--- /tmp/Xserver	2008-05-03 20:32:25.898796382 +0200
+++ xserver-common-1.22/X11/Xserver	2008-05-03 20:35:37.557410270 +0200
@@ -53,10 +53,14 @@
   ARGS="$ARGS -mouse /dev/touchscreen/ucb1x00"
 fi
 
-# use usb mouse if present
+# kdrive 1.4 onwards needs -mouse args
 # Xorg doesn't support "-mouse" option, and uses /dev/input/mice automatically
-if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/input/mice ] && [ "$XSERVER" != "Xorg" ]; then
-  ARGS="$ARGS -mouse /dev/input/mice"
+if [ -e "$TSLIB_TSDEVICE" ] ; then
+  ARGS="$ARGS -mouse tslib"
+else
+  if  [ -e /dev/input/mice ] && [ "$XSERVER" != "Xorg" ] ; then
+    ARGS="$ARGS -mouse /dev/input/mice"
+  fi
 fi
 
 # start off server in conventional location.
@@ -103,8 +107,7 @@
 	"Nokia RX-44")
 		ARGS="$ARGS -dpi 225 -screen ${SCREEN_SIZE} -mouse tslib" ;;
 	"GTA01" )
-	#we set 100 dpi for the time being, should the -dpi 285
-		ARGS="$ARGS -dpi 100 -screen 480x640" ;;
+		ARGS="$ARGS -dpi 285 -screen 480x640" ;;
 	"Motorola Ezx Platform")
 		ARGS="$ARGS -dpi 170 -screen 240x320" ;;
 	"ARM-IntegratorCP" | "ARM-Versatile PB")
@@ -130,4 +133,6 @@
 		fi
 esac
 
+echo "tslib: $TSLIB_TSDEVICE"
+echo "exec $XSERVER $ARGS $*"
 exec $XSERVER $ARGS $*