4 files changed, 7 insertions, 10 deletions

diff --git a/meta/packages/tslib/tslib/jornada7xx/ts.conf b/meta/packages/tslib/tslib/jornada7xx/ts.conf
index 20729b6154..09309719f2 100644
--- a/meta/packages/tslib/tslib/jornada7xx/ts.conf
+++ b/meta/packages/tslib/tslib/jornada7xx/ts.conf
@@ -1,4 +1,4 @@
-module_raw h3600
+module_raw input
 module pthres pmin=1
 module variance delta=30
 module dejitter delta=100
diff --git a/meta/packages/tslib/tslib/jornada7xx/tslib.sh b/meta/packages/tslib/tslib/jornada7xx/tslib.sh
index 1b5db781c1..040f4de3d5 100644
--- a/meta/packages/tslib/tslib/jornada7xx/tslib.sh
+++ b/meta/packages/tslib/tslib/jornada7xx/tslib.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-TSLIB_TSDEVICE=/dev/input/ts0
+TSLIB_TSDEVICE=/dev/input/event1
 
 export TSLIB_TSDEVICE
diff --git a/meta/packages/tslib/tslib/spitz/tslib.sh b/meta/packages/tslib/tslib/spitz/tslib.sh
index 0c8b1a12b9..0ff219b31f 100644
--- a/meta/packages/tslib/tslib/spitz/tslib.sh
+++ b/meta/packages/tslib/tslib/spitz/tslib.sh
@@ -1,16 +1,13 @@
 #!/bin/sh
 
+TSLIB_TSDEVICE=/dev/input/touchscreen0
+TSLIB_CONFFILE=/etc/ts.conf
+
 case `uname -r` in
 2.4*)
         TSLIB_TSDEVICE=/dev/ts
-        TSLIB_TSEVENTTYPE=CORGI
         TSLIB_CONFFILE=/usr/share/tslib/ts.conf-corgi-2.4
         ;;
-*)
-        TSLIB_TSDEVICE=/dev/input/touchscreen0
-        TSLIB_TSEVENTTYPE=INPUT
-        TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
-        ;;
 esac
 
-export TSLIB_TSDEVICE TSLIB_TSEVENTTYPE TSLIB_CONFFILE
+export TSLIB_TSDEVICE TSLIB_CONFFILE
diff --git a/meta/packages/tslib/tslib_1.0.bb b/meta/packages/tslib/tslib_1.0.bb
index 5e5f61cb35..3a5b8bab4d 100644
--- a/meta/packages/tslib/tslib_1.0.bb
+++ b/meta/packages/tslib/tslib_1.0.bb
@@ -4,7 +4,7 @@ AUTHOR = "Russell King w/ plugins by Chris Larson et. al."
 SECTION = "base"
 LICENSE = "LGPL"
 
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "http://download.berlios.de/tslib/tslib-1.0.tar.bz2 \
            file://ts.conf \