Merge packages changes from OE into poky.

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@386 311d38ba-8fff-0310-9ca6-ca027cbcb966

1 files changed, 11 insertions, 5 deletions

diff --git a/openembedded/packages/tslib/tslib/collie/tslib.sh b/openembedded/packages/tslib/tslib/collie/tslib.sh
index 187b7ce6d2..d9cc02cb1c 100644
--- a/openembedded/packages/tslib/tslib/collie/tslib.sh
+++ b/openembedded/packages/tslib/tslib/collie/tslib.sh
@@ -1,10 +1,16 @@
 #!/bin/sh
 
-if (uname -r|grep -q 'embedix'); then
+case `uname -r` in
+2.4*)
         TSLIB_TSDEVICE=/dev/ts
         TSLIB_TSEVENTTYPE=COLLIE
-else
-        TSLIB_TSDEVICE=/dev/input/event0
-fi
+        TSLIB_CONFFILE=/usr/share/tslib/ts.conf-collie-2.4
+        ;;
+*)
+        TSLIB_TSDEVICE=/dev/input/event1
+        TSLIB_TSEVENTTYPE=INPUT
+        TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
+        ;;
+esac
 
-export TSLIB_TSDEVICE TSLIB_TSEVENTTYPE
+export TSLIB_TSDEVICE TSLIB_TSEVENTTYPE TSLIB_CONFFILE