From 1b134e4cb5fe6d66f3cf8de1f33cd11ec684df89 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Thu, 3 Nov 2005 13:58:47 +0000
Subject: [PATCH] Update the kernel .bb against a good copy rather than one
 broken by monotone

git-svn-id: https://svn.o-hand.com/repos/poky@159 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 .../linux/linux-openzaurus_2.6.14-git3.bb       | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/openembedded/packages/linux/linux-openzaurus_2.6.14-git3.bb b/openembedded/packages/linux/linux-openzaurus_2.6.14-git3.bb
index 5a25c01213..757799579d 100644
--- a/openembedded/packages/linux/linux-openzaurus_2.6.14-git3.bb
+++ b/openembedded/packages/linux/linux-openzaurus_2.6.14-git3.bb
@@ -1,8 +1,6 @@
 include linux-openzaurus.inc
 
-PR = "r2"
-
-DEFAULT_PREFERENCE = "+1"
+PR = "r4"
 
 # Handy URLs
 # http://www.kernel.org/pub/linux/kernel/people/alan/linux-2.6/2.6.10/patch-2.6.10-ac8.gz;patch=1 \
@@ -24,9 +22,9 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.14.tar.gz \
            ${RPSRC}/ide_not_removable-r0.patch;patch=1 \
            ${RPSRC}/sharpsl_pm-r10.patch;patch=1 \
            ${RPSRC}/corgi_pm-r4.patch;patch=1 \
-           ${RPSRC}/spitz_base_extras-r7.patch;patch=1 \
+           ${RPSRC}/spitz_cf-r6.patch;patch=1 \
+           ${RPSRC}/spitz_base_extras-r9.patch;patch=1 \
            ${RPSRC}/spitz_pm-r5.patch;patch=1 \
-           ${RPSRC}/spitz_cf-r5.patch;patch=1 \
            ${RPSRC}/akita_mtd_fix-r0.patch;patch=1 \
            ${RPSRC}/max7310-r1.patch;patch=1 \
            ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \
@@ -35,10 +33,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.14.tar.gz \
            ${RPSRC}/jffs2_longfilename-r0.patch;patch=1 \
            ${RPSRC}/sharpsl_bl_kick-r1.patch;patch=1 \
            ${RPSRC}/corgi_snd-r14.patch;patch=1 \
-           ${RPSRC}/export_scoop-r0.patch;patch=1 \
            ${RPSRC}/pxa25x_cpufreq-r0.patch;patch=1 \
-           ${RPSRC}/alsa/alsa_soc-r0.patch;patch=1 \
-           ${RPSRC}/alsa/ssp_pxa_regs-r0.patch;patch=1 \
            ${RPSRC}/fbdev/fbdev-r0.patch;patch=1 \
            ${RPSRC}/fbdev/fbdev1-r0.patch;patch=1 \
            ${RPSRC}/fbdev/fbdev2-r0.patch;patch=1 \
@@ -46,10 +41,10 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.14.tar.gz \
            ${RPSRC}/fbdev/con_rotate-r0.patch;patch=1 \
            ${RPSRC}/fbdev/con_rotate1-r1.patch;patch=1 \
            ${RPSRC}/ipaq/hx2750_base-r22.patch;patch=1 \
-           ${RPSRC}/ipaq/hx2750_bl-r2.patch;patch=1 \
+           ${RPSRC}/ipaq/hx2750_bl-r3.patch;patch=1 \
            ${RPSRC}/ipaq/hx2750_pcmcia-r1.patch;patch=1 \
-           ${RPSRC}/ipaq/pxa_keys-r2.patch;patch=1 \
-           ${RPSRC}/ipaq/tsc2101-r8.patch;patch=1 \
+           ${RPSRC}/ipaq/pxa_keys-r3.patch;patch=1 \
+           ${RPSRC}/ipaq/tsc2101-r9.patch;patch=1 \
            ${RPSRC}/ipaq/hx2750_test1-r2.patch;patch=1 \
            ${DOSRC}/tc6393-device-r5.patch;patch=1 \
            ${DOSRC}/tc6393_nand-r6.patch;patch=1 \