summaryrefslogtreecommitdiff
path: root/packages/linux/linux-rp_2.6.20.bb
diff options
context:
space:
mode:
authorFlorian Boor <florian.boor@kernelconcepts.de>2007-06-12 14:45:27 +0000
committerFlorian Boor <florian.boor@kernelconcepts.de>2007-06-12 14:45:27 +0000
commitb1f4d34f8541f039d72d423223c91e32540a2fc5 (patch)
treec50f34a595a58cb31a25d96727c3e2c9c27c0a91 /packages/linux/linux-rp_2.6.20.bb
parent10013e9ed4e79a2f6ca0ceb6451787aaa47c46e5 (diff)
parentb655c71aac44af6eab2a52774ea810a945592cee (diff)
merge of '30c320b2f51c86226580e5bbf68fa8b0896a0655'
and '8dfee9b2427785432e4161eb7cc749155230e08e'
Diffstat (limited to 'packages/linux/linux-rp_2.6.20.bb')
-rw-r--r--packages/linux/linux-rp_2.6.20.bb8
1 files changed, 6 insertions, 2 deletions
diff --git a/packages/linux/linux-rp_2.6.20.bb b/packages/linux/linux-rp_2.6.20.bb
index 8da37cbcd6..9ef9413641 100644
--- a/packages/linux/linux-rp_2.6.20.bb
+++ b/packages/linux/linux-rp_2.6.20.bb
@@ -1,6 +1,6 @@
require linux-rp.inc
-PR = "r16"
+PR = "r17"
# Handy URLs
# git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046
@@ -80,7 +80,6 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.20.tar.bz2 \
SRC_URI_append_collie = "\
${TKSRC}/mtd-sharp-flash-hack-r2.patch;patch=1 \
- ${TKSRC}/collie-r3.patch;patch=1 \
${TKSRC}/ucb1x00-touch-audio-r1.patch;patch=1 \
${TKSRC}/mcp-sa11x0-r0.patch;patch=1 \
${TKSRC}/sa1100-udc-r2.patch;patch=1 \
@@ -88,6 +87,11 @@ SRC_URI_append_collie = "\
${TKSRC}/locomo-r0.patch;patch=1 \
${TKSRC}/collie-kexec.patch;patch=1 \
${TKSRC}/locomo_spi-r3.patch;patch=1 \
+ ${TKSRC}/sharpsl_pm.patch;patch=1 \
+ ${TKSRC}/collie_pm-2.patch;patch=1 \
+ ${TKSRC}/locomokeyb_suspendkey.patch;patch=1 \
+ ${TKSRC}/pcmcia_suspend.patch;patch=1 \
+ ${TKSRC}/ucb1x00_suspend.patch;patch=1 \
"
SRC_URI_append_tosa = "\