From 7f81aa50dbf7c580d55da5dfda6873929f3ec288 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@rpsys.net>
Date: Fri, 16 Sep 2005 11:48:19 +0000
Subject: linux-oz-2.6: Updates to the tosa patches so they apply cleanly (and
 some from Dirk). Fix some types in other patches

---
 packages/linux/linux-openzaurus_2.6.13-mm3.bb | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'packages')

diff --git a/packages/linux/linux-openzaurus_2.6.13-mm3.bb b/packages/linux/linux-openzaurus_2.6.13-mm3.bb
index 1213b8416a..cc9ec6df0d 100644
--- a/packages/linux/linux-openzaurus_2.6.13-mm3.bb
+++ b/packages/linux/linux-openzaurus_2.6.13-mm3.bb
@@ -28,6 +28,10 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \
            ${RPSRC}/sharpsl_mtd_extras-r1.patch;patch=1 \
            ${RPSRC}/ohci_portcount-r0.patch;patch=1 \
            ${RPSRC}/pxa_ohci_power-r0.patch;patch=1 \
+           ${RPSRC}/corgi_cleanup-r0.patch;patch=1 \
+           ${RPSRC}/poodle_cleanup-r0.patch;patch=1 \
+           ${RPSRC}/poodle_mmc-r0.patch;patch=1 \
+           ${RPSRC}/poodle_irda-r0.patch;patch=1 \
            ${RPSRC}/pxa_i2c_fixes-r0.patch;patch=1 \
            ${RPSRC}/spitz_usbsuspend-r0.patch;patch=1 \	   
            ${RPSRC}/pxa_ohci_platform-r0.patch;patch=1 \
@@ -35,16 +39,12 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \
            ${RPSRC}/corgi_pm-r3.patch;patch=1 \
            ${RPSRC}/spitz_base_extras-r2.patch;patch=1 \
            ${RPSRC}/spitz_pm-r3.patch;patch=1 \
-           ${RPSRC}/corgi_cleanup-r0.patch;patch=1 \
-           ${RPSRC}/poodle_cleanup-r0.patch;patch=1 \
-           ${RPSRC}/poodle_mmc-r0.patch;patch=1 \
-           ${RPSRC}/poodle_irda-r0.patch;patch=1 \
            ${RPSRC}/scoop_collie_fix-r0.patch;patch=1 \
            ${RPSRC}/spitz_kbd_fix1-r0.patch;patch=1 \
            ${RPSRC}/spitzcf-r3.patch;patch=1 \
            ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \
            ${RPSRC}/pxa_remove_static-r0.patch;patch=1 \
-           ${RPSRC}/pxa_irda-r3.patch;patch=1 \
+           ${RPSRC}/pxa_irda-r4.patch;patch=1 \
            ${RPSRC}/corgi_irda-r3.patch;patch=1 \
            ${RPSRC}/pxa_rtc-r1.patch;patch=1 \
            ${RPSRC}/scoop_susres-r1.patch;patch=1 \
@@ -53,15 +53,15 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \
            ${RPSRC}/sharpsl_bl_kick-r1.patch;patch=1 \
            ${RPSRC}/corgi_snd-r10.patch;patch=1 \
            ${RPSRC}/ipaq/hx2750_base-r20.patch;patch=1 \
-           ${RPSRC}/ipaq/hx2750_bl-r1.patch;patch=1 \
+           ${RPSRC}/ipaq/hx2750_bl-r2.patch;patch=1 \
            ${RPSRC}/ipaq/hx2750_pcmcia-r1.patch;patch=1 \
            ${RPSRC}/ipaq/pxa_keys-r2.patch;patch=1 \
-           ${RPSRC}/ipaq/tsc2101-r7.patch;patch=1 \
+           ${RPSRC}/ipaq/tsc2101-r8.patch;patch=1 \
            ${RPSRC}/ipaq/hx2750_test1-r2.patch;patch=1 \
            ${DOSRC}/pxa2xx-ir-dma-r0.patch;patch=1 \
            ${DOSRC}/tc6393-device-r5.patch;patch=1 \
            ${DOSRC}/tc6393_nand-r6.patch;patch=1 \
-           ${DOSRC}/tosa-machine-base-r11.patch;patch=1 \
+           ${DOSRC}/tosa-machine-base-r12.patch;patch=1 \
            ${DOSRC}/tosa-keyboard-r6.patch;patch=1 \
            ${RPSRC}/temp/tc6393fb-r7.patch;patch=1 \
            ${DOSRC}/tosa-power-r6.patch;patch=1 \
@@ -69,7 +69,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \
            ${DOSRC}/tosa-udc-r4.patch;patch=1 \
            ${DOSRC}/tosa-irda-r3.patch;patch=1 \
            ${DOSRC}/tosa-lcd-r3.patch;patch=1 \
-           ${DOSRC}/tosa-bl-r5.patch;patch=1 \
+           ${RPSRC}/temp/tosa-bl-r7.patch;patch=1 \
            ${RPSRC}/pcmcia_dev_ids-r1.patch;patch=1 \
            ${RPSRC}/mmc_timeout-r0.patch;patch=1 \	   
            ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1 \
-- 
cgit v1.2.3