Merge bk://oe-devel@oe-devel.bkbits.net/openembedded

into tim.rpsys.net:/usr/oe/openembedded

2005/06/23 16:06:10+01:00 rpsys.net!RP
linux-oz-2.6: Prepare w100 code for mainline. Update corgi battery sysfs code.

BKrev: 42bacffcgQZccOvYAfwQNk7-Sje4uw

diff --git a/packages/linux/linux-openzaurus_2.6.12-mm1.bb b/packages/linux/linux-openzaurus_2.6.12-mm1.bb
index c1e097e..d692c03 100644 (file)
--- a/packages/linux/linux-openzaurus_2.6.12-mm1.bb
+++ b/packages/linux/linux-openzaurus_2.6.12-mm1.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}"
 KV = "${@bb.data.getVar('PV',d,True)}"
 
-PR = "r1"
+PR = "r2"
 
 DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches"
 RPSRC = "http://www.rpsys.net/openzaurus/patches"
@@ -31,6 +31,8 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \
            ${RPSRC}/corgi_tspmu-r1.patch;patch=1 \                
            ${RPSRC}/oprofile_trace-r3.patch;patch=1 \
            ${RPSRC}/preempt_nwfpe-r0.patch;patch=1 \
+           ${RPSRC}/w100_core-r0.patch;patch=1 \          
+           ${RPSRC}/w100_corgi-r0.patch;patch=1 \
            ${RPSRC}/corgi_kbd3-r6.patch;patch=1 \
            ${RPSRC}/corgi_kbd_susres-r0.patch;patch=1 \
            ${RPSRC}/pxa_rtc-r1.patch;patch=1 \
@@ -40,11 +42,10 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \
            ${RPSRC}/corgi_irda-r2.patch;patch=1 \
            ${RPSRC}/corgi_base_extras1-r2.patch;patch=1 \
            ${RPSRC}/jffs2_longfilename-r0.patch;patch=1 \
-           ${RPSRC}/corgi_power-r22.patch;patch=1 \
+           ${RPSRC}/corgi_power-r24.patch;patch=1 \
            ${RPSRC}/corgi_power1-r1.patch;patch=1 \
            ${RPSRC}/mmc_sd-r5.patch;patch=1 \
            ${RPSRC}/corgi_snd-r6.patch;patch=1 \
-           ${RPSRC}/w100_split-r11.patch;patch=1 \
            ${RPSRC}/pxa_i2c-r2.patch;patch=1 \
            ${DOSRC}/pxa-i2c-suspend-r0.patch;patch=1 \
            ${DOSRC}/pxa-i2c-func-r0.patch;patch=1 \