From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Wed, 16 Jan 2008 14:27:43 +0000 (+0000)
Subject: linux-rp: for collie, use thesing's patches instead of Dirk's in 2.6.24-rc6
X-Git-Tag: Release-2010-05/1~7890^2~7^2~3^2~1^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f0ee954dd96ad99345d8ac116a9fecf92920a9ae;p=openembedded.git

linux-rp: for collie, use thesing's patches instead of Dirk's in 2.6.24-rc6
---

diff --git a/packages/linux/linux-rp_2.6.23+2.6.24-rc6+git.bb b/packages/linux/linux-rp_2.6.23+2.6.24-rc6+git.bb
index 1194f71bb2..48211e54ca 100644
--- a/packages/linux/linux-rp_2.6.23+2.6.24-rc6+git.bb
+++ b/packages/linux/linux-rp_2.6.23+2.6.24-rc6+git.bb
@@ -1,6 +1,6 @@
 require linux-rp.inc
 
-PR = "r3"
+PR = "r4"
 
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_collie = "1"
@@ -86,13 +86,17 @@ SRC_URI = "${KERNELORG_MIRROR}pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2 \
 # These patches are extracted from Pavel Machek's git tree
 # (diff against vanilla kernel)
 SRC_URI_append_collie = "\
-           ${DOSRC}/collie/mtd-sharp-flash-hack-r0.patch;patch=1 \
-           ${DOSRC}/collie/collie-r0.patch;patch=1 \
-           ${DOSRC}/collie/locomolcd-backlight-r0.patch;patch=1 \
-           ${DOSRC}/collie/ucb1x00-touch-audio-r0.patch;patch=1 \
-           file://collie-mcp-r1.patch;patch=1 \
-           ${DOSRC}/collie/sa1100-udc-r0.patch;patch=1 \
-#          ${DOSRC}/collie/collie-pm-r1.patch;patch=1 \
+       ${TKSRC}/${PN}_${PV}/mtd-sharp-flash-hack-r3.patch;patch=1 \
+       ${TKSRC}/${PN}_${PV}/mcp-sa11x0-r0.patch;patch=1 \
+       ${TKSRC}/${PN}_${PV}/locomo-r0.patch;patch=1 \
+       ${TKSRC}/${PN}_${PV}/locomo_spi-4.patch;patch=1 \
+       ${TKSRC}/${PN}_${PV}/collie-kexec.patch;patch=1 \
+       ${TKSRC}/${PN}_${PV}/sharpsl_pm-2.patch;patch=1 \
+       ${TKSRC}/${PN}_${PV}/collie_pm-2.patch;patch=1 \
+       ${TKSRC}/${PN}_${PV}/locomokeyb_suspendkey-2.patch;patch=1 \
+       ${TKSRC}/${PN}_${PV}/ucb1x00_suspend.patch;patch=1 \
+       ${TKSRC}/${PN}_${PV}/collie-ts.patch;patch=1 \
+       ${TKSRC}/${PN}_${PV}/pcmcia_suspend.patch;patch=1 \
 "
 
 SRC_URI_append_tosa = "\