linux-rp: Sync with changes in OE.dev

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1302 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/packages/linux/linux-rp_2.6.20.bb b/meta/packages/linux/linux-rp_2.6.20.bb
index c84d5273488e009ee052e7f73789edd7ebc3cf3f..13ceaa0a192441ad230bd207eef8f79c5fa13522 100644 (file)
--- a/meta/packages/linux/linux-rp_2.6.20.bb
+++ b/meta/packages/linux/linux-rp_2.6.20.bb
@@ -1,6 +1,6 @@
 require linux-rp.inc
 
-PR = "r3"
+PR = "r4"
 
 # Handy URLs
 # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046
@@ -14,7 +14,7 @@ PR = "r3"
 # Patches submitted upstream are towards top of this list 
 # Hacks should clearly named and at the bottom
 SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.20.tar.bz2 \
-           http://opensource.wolfsonmicro.com/~lg/asoc/asoc-v0.13.patch;patch=1;status=merged \
+           http://opensource.wolfsonmicro.com/~lg/asoc/asoc-v0.13.3.patch;patch=1;status=merged \
            ${RPSRC}/oprofile_always_bt_arm-r0.patch;patch=1 \
            ${RPSRC}/lzo_kernel-r0.patch;patch=1 \
            ${RPSRC}/lzo_jffs2-r0.patch;patch=1 \
@@ -34,7 +34,7 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.20.tar.bz2 \
            ${RPSRC}/pm_changes-r1.patch;patch=1 \
            ${RPSRC}/usb_add_epalloc-r3.patch;patch=1 \
            ${RPSRC}/usb_pxa27x_udc-r3.patch;patch=1 \
-           ${RPSRC}/kexec-arm-r4.patch;patch=1 \
+           ${RPSRC}/kexec-arm-r4a.patch;patch=1 \
            ${RPSRC}/locomo_kbd_tweak-r1.patch;patch=1 \
            ${RPSRC}/poodle_pm-r3.patch;patch=1 \
            ${RPSRC}/pxa27x_overlay-r5.patch;patch=1 \