From 5fb35ca11147ed30c619cf93e19331fd835f3da9 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Fri, 10 Feb 2006 14:33:55 +0000
Subject: Apply more chanegs from OE

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@272 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 .../packages/linux/linux-openzaurus_2.6.15.bb      | 29 ++++++++++++----------
 1 file changed, 16 insertions(+), 13 deletions(-)

(limited to 'openembedded/packages/linux')

diff --git a/openembedded/packages/linux/linux-openzaurus_2.6.15.bb b/openembedded/packages/linux/linux-openzaurus_2.6.15.bb
index 3e75c8f9a..3eae7cbc8 100644
--- a/openembedded/packages/linux/linux-openzaurus_2.6.15.bb
+++ b/openembedded/packages/linux/linux-openzaurus_2.6.15.bb
@@ -1,6 +1,6 @@
 include linux-openzaurus.inc
 
-PR = "r3"
+PR = "r5"
 
 # Handy URLs
 # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \
@@ -21,22 +21,26 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.15.tar.bz2 \
            ${RPSRC}/scoop_cpr_fix-r1.patch;patch=1 \
            ${RPSRC}/pxa2xx_release-r1.patch;patch=1 \
            ${RPSRC}/arm_apm_pm_legacy-r1.patch;patch=1 \
+           ${RPSRC}/arm_checksum_memory-r0.patch;patch=1 \
+           ${RPSRC}/pxa_clocks-r0.patch;patch=1 \
            ${RPSRC}/ide_not_removable-r0.patch;patch=1 \
            ${RPSRC}/sharpsl_pm_move-r0.patch;patch=1 \
            ${RPSRC}/sharpsl_pm_gcc4_fix-r0.patch;patch=1 \
            ${RPSRC}/pcmcia_dev_ids-r3.patch;patch=1 \
-           ${RPSRC}/led_core-r11.patch;patch=1 \
-           ${RPSRC}/led_triggers-r9.patch;patch=1 \
-           ${RPSRC}/led_trig_timer-r4.patch;patch=1 \
+           ${RPSRC}/led_core-r12.patch;patch=1 \
+           ${RPSRC}/led_triggers-r10.patch;patch=1 \
+           ${RPSRC}/led_trig_timer-r5.patch;patch=1 \
            ${RPSRC}/led_trig_sharpsl_pm-r4a.patch;patch=1 \
-           ${RPSRC}/led_zaurus-r8.patch;patch=1 \
-           ${RPSRC}/led_locomo-r5.patch;patch=1 \
-           ${RPSRC}/led_ixp4xx-r0.patch;patch=1 \
-           ${RPSRC}/led_tosa-r2.patch;patch=1 \	   
-           ${RPSRC}/led_ide-r2.patch;patch=1 \
+           ${RPSRC}/led_zaurus-r9.patch;patch=1 \
+           ${RPSRC}/led_locomo-r6.patch;patch=1 \
+           ${RPSRC}/led_ixp4xx-r1.patch;patch=1 \
+           ${RPSRC}/led_tosa-r3.patch;patch=1 \	   
+           ${RPSRC}/led_ide-r3.patch;patch=1 \
            ${RPSRC}/led_nand-r2.patch;patch=1 \
+           ${RPSRC}/ide_end_request-r0.patch;patch=1 \
            ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \
-           ${RPSRC}/pxa_rtc-r3.patch;patch=1 \
+           ${RPSRC}/rtc_class-r0.patch;patch=1 \
+           ${RPSRC}/rtc_class_pxa-r0.patch;patch=1 \
            ${RPSRC}/input_power-r4.patch;patch=1 \
            ${RPSRC}/jffs2_longfilename-r0.patch;patch=1 \
            ${RPSRC}/pxa25x_cpufreq-r0.patch;patch=1 \
@@ -67,11 +71,10 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.15.tar.bz2 \
            ${RPSRC}/zaurus_keyboard_tweak-r0.patch;patch=1 \
            ${RPSRC}/corgi_bl_cleanup-r2.patch;patch=1 \
            ${RPSRC}/corgi_bl_generic-r2.patch;patch=1 \
-           ${RPSRC}/arm_checksum_memory-r0.patch;patch=1 \
            ${RPSRC}/pxafb_tweaks-r0.patch;patch=1 \
-           ${RPSRC}/pxa_clocks-r0.patch;patch=1 \
            ${RPSRC}/pm_changes-r0.patch;patch=1 \
-           ${RPSRC}/sharpsl_pm-do-r1.patch;patch=1 \
+           ${RPSRC}/sharpsl_pm-do-r2.patch;patch=1 \
+           ${DOSRC}/kexec-arm-r0.patch \
            file://add-oz-release-string.patch;patch=1 \
            file://pxa-serial-hack.patch;patch=1 \
            ${RPSRC}/pxa-linking-bug.patch;patch=1 \
-- 
cgit v1.2.3