linux-oz-2.6: dev kernel tosa updates from Dirk, ohci fix, add collie mtd update patch and remove the pm_legacy dependency from arm apm

2 files changed, 20 insertions, 15 deletions

diff --git a/packages/linux/linux-openzaurus.inc b/packages/linux/linux-openzaurus.inc
index c95bc7396e..4bd71d7601 100644
--- a/packages/linux/linux-openzaurus.inc
+++ b/packages/linux/linux-openzaurus.inc
@@ -3,7 +3,7 @@ SECTION = "kernel"
 MAINTAINER = "Richard Purdie <rpurdie@rpsys.net>, Michael 'Mickey' Lauer <mickey@vanille.de>"
 LICENSE = "GPL"
 
-DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches"
+DOSRC = "http://www.do13.de/openzaurus/patches"
 RPSRC = "http://www.rpsys.net/openzaurus/patches"
 JLSRC = "http://www.cs.wisc.edu/~lenz/zaurus/files"
 BASRC = "http://www.orca.cx/zaurus/patches"
diff --git a/packages/linux/linux-openzaurus_2.6.14+2.6.15-rc2.bb b/packages/linux/linux-openzaurus_2.6.14+2.6.15-rc2.bb
index 31797313e5..9687967d92 100644
--- a/packages/linux/linux-openzaurus_2.6.14+2.6.15-rc2.bb
+++ b/packages/linux/linux-openzaurus_2.6.14+2.6.15-rc2.bb
@@ -1,6 +1,6 @@
 include linux-openzaurus.inc
 
-PR = "r1"
+PR = "r2"
 
 #DEFAULT_PREFERENCE = "-1"
 
@@ -17,6 +17,7 @@ PR = "r1"
 SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/testing/linux-2.6.15-rc2.tar.bz2 \
            ${RPSRC}/pxa_ohci_platform-r5.patch;patch=1 \
            ${RPSRC}/pxa_ohci_suspend-r5.patch;patch=1 \
+           ${RPSRC}/pxa_ohci_fixes-r0.patch;patch=1 \
            ${RPSRC}/spitz_ohci-r0.patch;patch=1 \
            ${RPSRC}/enable_iwmmxt-r0.patch;patch=1 \
            ${RPSRC}/pxa_i2c_fixes-r4.patch;patch=1 \
@@ -31,6 +32,8 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/testing/linux-2.6.15-rc2.
            ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \
            ${RPSRC}/pxa_rtc-r2.patch;patch=1 \
            ${RPSRC}/input_power-r4.patch;patch=1 \
+           ${RPSRC}/arm_apm_pm_legacy-r1.patch;patch=1 \
+           ${RPSRC}/collie_mtd_sharp-r0.patch;patch=1 \
            ${RPSRC}/jffs2_longfilename-r0.patch;patch=1 \
            ${RPSRC}/pxa25x_cpufreq-r0.patch;patch=1 \
            ${RPSRC}/ipaq/hx2750_base-r24.patch;patch=1 \
@@ -39,15 +42,23 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/testing/linux-2.6.15-rc2.
            ${RPSRC}/ipaq/pxa_keys-r5.patch;patch=1 \
            ${RPSRC}/ipaq/tsc2101-r12.patch;patch=1 \
            ${RPSRC}/ipaq/hx2750_test1-r3.patch;patch=1 \
-           ${DOSRC}/tc6393-device-r5.patch;patch=1 \
-           ${DOSRC}/tc6393_nand-r6.patch;patch=1 \
-           ${DOSRC}/tosa-keyboard-r6.patch;patch=1 \
+           ${DOSRC}/tosa-platform-device-r0.patch;patch=1 \
+           ${DOSRC}/tc6393-device-r8.patch;patch=1 \
+           ${DOSRC}/tc6393_nand-r7.patch;patch=1 \
+           ${DOSRC}/tosa-keyboard-r9.patch;patch=1 \
+           ${DOSRC}/tosa-pxaac97-r5.patch;patch=1 \
+           ${DOSRC}/tosa-tc6393-r1.patch;patch=1 \
+           ${DOSRC}/tosa-power-r9.patch;patch=1 \
+           ${DOSRC}/tc6393fb-r9.patch;patch=1 \
+           ${DOSRC}/tosa-lcd-r6.patch;patch=1 \
+           ${DOSRC}/tosa-bl-r9.patch;patch=1 \
+           ${DOSRC}/tosa-bluetooth-r2.patch;patch=1 \
            ${RPSRC}/pcmcia_dev_ids-r2.patch;patch=1 \
            ${RPSRC}/mmc_timeout-r0.patch;patch=1 \	   
            ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1 \
            ${RPSRC}/alsa/alsa-soc-0.7.patch;patch=1 \
-           ${RPSRC}/alsa_snd_corgi-r1.patch;patch=1 \
-           ${RPSRC}/soc_platform_upd-r0.patch;patch=1 \
+           ${RPSRC}/alsa_snd_corgi-r2.patch;patch=1 \
+           ${RPSRC}/soc_platform_upd-r1.patch;patch=1 \
            file://add-oz-release-string.patch;patch=1 \
            file://pxa-serial-hack.patch;patch=1 \
            ${RPSRC}/jl1/pxa-linking-bug.patch;patch=1 \
@@ -76,14 +87,8 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/testing/linux-2.6.15-rc2.
 # ${JLSRC}/zaurus-leds-2.6.11.diff.gz;patch=1 \
 
 SRC_URI_append_tosa = "${DOSRC}/nand-readid-r1.patch;patch=1 \
-                       ${RPSRC}/temp/tc6393fb-r7.patch;patch=1 \
-                       ${DOSRC}/tosa-power-r6.patch;patch=1 \
-                       ${DOSRC}/tosa-lcd-r3.patch;patch=1 \
-                       ${RPSRC}/temp/tosa-bl-r7.patch;patch=1 \
-                       ${DOSRC}/pxa-ac97-suspend-r0.patch;patch=1 \
 		       ${DOSRC}/ac97codec-rename-revert-r0.patch;patch=1 \
-                       ${DOSRC}/wm9712-ts-r3.patch;patch=1 \
-                       ${DOSRC}/tosa-pxaac97-r4.patch;patch=1 \
-        	       ${DOSRC}/tosa-bluetooth-r0.patch;patch=1 "
+                       ${DOSRC}/wm97xx-touch-lg2-r0.patch;patch=1 \
+                       ${DOSRC}/wm9712-pm-r0.patch;patch=1 "
 
 S = "${WORKDIR}/linux-2.6.15-rc2"