Merge bk://openembedded@openembedded.bkbits.net/packages

into dixie.nexus.co.uk:/home/pb/oe/oe-packages

2004/07/15 22:04:29+01:00 nexus.co.uk!pb
add simpad-switches-input2.diff, courtesy Florian Boor

BKrev: 40f6f16aEvBHV_v7j97Q_pjjOLi1kw

diff --git a/linux/opensimpad-2.4.25-vrs2-pxa1-jpm1/simpad-switches-input2.diff b/linux/opensimpad-2.4.25-vrs2-pxa1-jpm1/simpad-switches-input2.diff
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.oe b/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.oe
index 22605cb..434c195 100644 (file)
--- a/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.oe
+++ b/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.oe
@@ -5,7 +5,7 @@ KV = "${@oe.data.getVar('PV',d,True).split('-')[0]}"
 VRSV = "${@oe.data.getVar('PV',d,True).split('-')[1]}"
 PXAV = "${@oe.data.getVar('PV',d,True).split('-')[2]}"
 JPMV = "${@oe.data.getVar('PV',d,True).split('-')[3]}"
-PR = "r9"
+PR = "r10"
 
 FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/opensimpad-${PV}"
 
@@ -21,6 +21,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \
            file://mipv6-1.1-v2.4.25.patch;patch=1 \
            file://simpad-backlight-if.diff;patch=1;pnum=0 \
            file://simpad-switches-input.diff;patch=1;pnum=0 \
+           file://simpad-switches-input2.diff;patch=1;pnum=0 \
            file://simpad-apm.diff;patch=1;pnum=0 \
            file://simpad-ts-noninput.diff;patch=1;pnum=0"