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

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

2005/04/24 17:39:02+01:00 rpsys.net!RP
linux-oz-2.6: Fix sound problems introduced by the last fixes :)

BKrev: 426bcbbc2WRCzq---G2G1poeJnovlA

diff --git a/packages/linux/linux-openzaurus_2.6.11.bb b/packages/linux/linux-openzaurus_2.6.11.bb
index a41f2c9..e45cb51 100644 (file)
--- a/packages/linux/linux-openzaurus_2.6.11.bb
+++ b/packages/linux/linux-openzaurus_2.6.11.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}"
 KV = "${@bb.data.getVar('PV',d,True)}"
 
-PR = "r15"
+PR = "r16"
 
 DOSRC = "http://www.do13.in-berlin.de/openzaurus"
 RPSRC = "http://www.rpsys.net/openzaurus/patches"
@@ -52,7 +52,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.11.tar.gz \
            ${RPSRC}/corgi_power1-r1.patch;patch=1 \
            ${RPSRC}/ide_fixes-r1.patch;patch=1 \
            ${RPSRC}/mmc_sd-r4.patch;patch=1 \
-           ${RPSRC}/corgi_snd-r5.patch;patch=1 \
+           ${RPSRC}/corgi_snd-r6.patch;patch=1 \
            ${RPSRC}/w100_split-r5-r1.patch;patch=1 \
            ${DOSRC}/pxa2xx-ir-dma-r0.patch;patch=1 \
            ${DOSRC}/tc6393-device-r2.patch;patch=1 \

diff --git a/packages/linux/linux-openzaurus_2.6.12-rc2-mm3.bb b/packages/linux/linux-openzaurus_2.6.12-rc2-mm3.bb
index e5f0b2b..e57d326 100644 (file)
--- a/packages/linux/linux-openzaurus_2.6.12-rc2-mm3.bb
+++ b/packages/linux/linux-openzaurus_2.6.12-rc2-mm3.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}"
 KV = "${@bb.data.getVar('PV',d,True)}"
 
-PR = "r2"
+PR = "r3"
 
 DEFAULT_PREFERENCE = "-1"
 
@@ -39,7 +39,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.11.tar.gz \
            ${RPSRC}/corgi_power1-r1.patch;patch=1 \
            ${RPSRC}/ide_fixes-r2.patch;patch=1 \
            ${RPSRC}/mmc_sd-r4.patch;patch=1 \
-           ${RPSRC}/corgi_snd-r5.patch;patch=1 \
+           ${RPSRC}/corgi_snd-r6.patch;patch=1 \
            ${RPSRC}/w100_split-r8.patch;patch=1 \
            ${DOSRC}/pxa2xx-ir-dma-r0.patch;patch=1 \
            ${DOSRC}/tc6393-device-r2.patch;patch=1 \