summaryrefslogtreecommitdiff
path: root/packages/linux/linux-rp_2.6.24.bb
diff options
context:
space:
mode:
authorRobert Schuster <thebohemian@gmx.net>2008-02-16 15:09:09 +0000
committerRobert Schuster <thebohemian@gmx.net>2008-02-16 15:09:09 +0000
commitbb9bbef24b7680a453a01643f0cee659cf32dbd3 (patch)
tree7a0123ee49cd4fb648e38ab14100503750bce765 /packages/linux/linux-rp_2.6.24.bb
parent8af665768f69f7bc46c9912d849fd59f8bef0a5d (diff)
parent4e742a9df221b673cd5cd74affd9d4382cd26c8c (diff)
merge of '1821f6eadefc14ad7ce51d5ab026da139608f557'
and 'b214e193f52c5b76dce3027376c5bd7eafce9971'
Diffstat (limited to 'packages/linux/linux-rp_2.6.24.bb')
-rw-r--r--packages/linux/linux-rp_2.6.24.bb3
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/linux/linux-rp_2.6.24.bb b/packages/linux/linux-rp_2.6.24.bb
index f30d88b731..c42b2d2ce7 100644
--- a/packages/linux/linux-rp_2.6.24.bb
+++ b/packages/linux/linux-rp_2.6.24.bb
@@ -1,6 +1,6 @@
require linux-rp.inc
-PR = "r3"
+PR = "r4"
DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_collie = "1"
@@ -41,6 +41,7 @@ SRC_URI = "${KERNELORG_MIRROR}pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2 \
${RPSRC}/poodle_pm-r5.patch;patch=1 \
${RPSRC}/poodle_lcd_hack-r0.patch;patch=1 \
${RPSRC}/poodle_asoc_fix-r1.patch;patch=1 \
+ file://pxa27x-resume.patch;patch=1;status=external \
file://squashfs3.3.patch;patch=1;status=external \
${RPSRC}/logo_oh-r1.patch.bz2;patch=1;status=unmergable \
${RPSRC}/pxa-linking-bug.patch;patch=1;status=unmergable \