merge of f1ee0327eee91259e262ed28b04a96ddf20d8b7c

     and f987f3f02d0566836caf6a5ae54ac223d0a97609

3 files changed, 16 insertions, 15 deletions

diff --git a/packages/gcc/gcc_csl-arm-20050416.bb b/packages/gcc/gcc_csl-arm-20050416.bb
index c482861210..87ac9840ce 100644
--- a/packages/gcc/gcc_csl-arm-20050416.bb
+++ b/packages/gcc/gcc_csl-arm-20050416.bb
@@ -6,6 +6,6 @@ PR = "r3"
 
 CVSDATE = "20050416"
 OVERRIDES_append = ":${TARGET_ARCH}-${TARGET_OS}"
-DEFAULT_PREFERENCE_arm-linux = "1"
+DEFAULT_PREFERENCE_arm-linux = "-1"
 DEFAULT_PREFERENCE_arm-linuxeabi = "1"
 
diff --git a/packages/gcc/gcc_csl-arm-20050603.bb b/packages/gcc/gcc_csl-arm-20050603.bb
index 2efa14186e..142a350a09 100644
--- a/packages/gcc/gcc_csl-arm-20050603.bb
+++ b/packages/gcc/gcc_csl-arm-20050603.bb
@@ -10,4 +10,4 @@ PR = "r0"
 CVSDATE = "20050603"
 OVERRIDES_append = ":${TARGET_ARCH}-${TARGET_OS}"
 
-DEFAULT_PREFERENCE_arm = "1"
+DEFAULT_PREFERENCE_arm = "-1"
diff --git a/packages/linux/linux-openzaurus_2.6.13-mm1.bb b/packages/linux/linux-openzaurus_2.6.13-mm1.bb
index 3a5284e069..a1d6305f37 100644
--- a/packages/linux/linux-openzaurus_2.6.13-mm1.bb
+++ b/packages/linux/linux-openzaurus_2.6.13-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 = "r3"
+PR = "r4"
 
 DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches"
 RPSRC = "http://www.rpsys.net/openzaurus/patches"
@@ -46,24 +46,27 @@ BASRC = "http://www.orca.cx/zaurus/patches"
 #           ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.13-rc5.bz2;patch=1 \
 SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \
            ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.13/2.6.13-mm1/2.6.13-mm1.bz2;patch=1 \
-           ${RPSRC}/spitz_usbsuspend-r0.patch;patch=1 \	   
+           ${RPSRC}/pxa_pcmcia_init-r1.patch;patch=1 \
+           ${RPSRC}/pxafb_hsync-r2.patch;patch=1 \
+           ${RPSRC}/borzoi_machtype-r0.patch;patch=1 \
+           ${RPSRC}/sharp_multi_pcmcia-r4.patch;patch=1 \
            ${RPSRC}/ohci_portcount-r0.patch;patch=1 \
            ${RPSRC}/pxa_ohci_power-r0.patch;patch=1 \
+           ${RPSRC}/spitz_usbsuspend-r0.patch;patch=1 \	   
            ${RPSRC}/pxa_ohci_platform-r0.patch;patch=1 \
            ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \
-           ${RPSRC}/pxa_pcmcia_init-r1.patch;patch=1 \
            ${RPSRC}/pxa_remove_static-r0.patch;patch=1 \
-           ${RPSRC}/pxafb_hsync-r2.patch;patch=1 \
-           ${RPSRC}/borzoi_machtype-r0.patch;patch=1 \
-           ${RPSRC}/sharp_multi_pcmcia-r3.patch;patch=1 \
            ${RPSRC}/sharpsl_detection-r1.patch;patch=1 \
-           ${RPSRC}/sharpsl_ssp-r0.patch;patch=1 \
+           ${RPSRC}/sharpsl_ssp-r2.patch;patch=1 \
            ${RPSRC}/sharpsl_lcd-r2.patch;patch=1 \
            ${RPSRC}/sharpsl_ts-r3.patch;patch=1 \
            ${RPSRC}/sharpsl_bl-r3.patch;patch=1 \
-           ${RPSRC}/sharpsl_pm-r6.patch;patch=1 \
-           ${RPSRC}/corgi_pm-r1.patch;patch=1 \
-           ${RPSRC}/spitzkbd-r1.patch;patch=1 \
+           ${RPSRC}/sharpsl_pm-r7.patch;patch=1 \
+           ${RPSRC}/spitz_base-r15.patch;patch=1 \
+           ${RPSRC}/spitz_base_extras-r1.patch;patch=1 \
+           ${RPSRC}/corgi_pm-r2.patch;patch=1 \
+           ${RPSRC}/spitz_pm-r2.patch;patch=1 \
+           ${RPSRC}/spitzkbd-r2.patch;patch=1 \
            ${RPSRC}/spitzcf-r2.patch;patch=1 \
            ${RPSRC}/pxa_rtc-r1.patch;patch=1 \
            ${RPSRC}/pxa_irda-r3.patch;patch=1 \
@@ -83,7 +86,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \
            ${DOSRC}/pxa2xx-ir-dma-r0.patch;patch=1 \
            ${DOSRC}/tc6393-device-r4.patch;patch=1 \
            ${DOSRC}/tc6393_nand-r6.patch;patch=1 \
-           ${DOSRC}/tosa-machine-base-r6.patch;patch=1 \
+           ${RPSRC}/temp/tosa-machine-base-r7.patch;patch=1 \
            ${DOSRC}/tosa-keyboard-r6.patch;patch=1 \
            ${DOSRC}/tc6393fb-r6.patch;patch=1 \
            ${DOSRC}/tosa-power-r5.patch;patch=1 \
@@ -93,8 +96,6 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \
            ${DOSRC}/tosa-lcd-r3.patch;patch=1 \
            ${DOSRC}/tosa-2.6.13-r1.patch;patch=1 \
            ${RPSRC}/temp/tosa-bl-r5.patch;patch=1 \
-           ${RPSRC}/spitz_base-r11.patch;patch=1 \
-           ${RPSRC}/spitz_pm-r1.patch;patch=1 \
            ${RPSRC}/scoop_susres-r0.patch;patch=1 \
            ${RPSRC}/pcmcia_dev_ids-r1.patch;patch=1 \
            ${RPSRC}/mmc_timeout-r0.patch;patch=1 \