linux-oz-2.6: Rearrange patches to reflect submission status. Minor tweaks to make the defconfigs more equal. Update git kernel to a more recent version of the kernel.

1 files changed, 17 insertions, 14 deletions

diff --git a/packages/linux/linux-openzaurus_2.6.16+git.bb b/packages/linux/linux-openzaurus_2.6.16+git.bb
index 4a3d8d62b4..e81838ba66 100644
--- a/packages/linux/linux-openzaurus_2.6.16+git.bb
+++ b/packages/linux/linux-openzaurus_2.6.16+git.bb
@@ -1,6 +1,6 @@
 include linux-openzaurus.inc
 
-PR = "r15"
+PR = "r18"
 
 DEFAULT_PREFERENCE = "-1"
 
@@ -15,12 +15,16 @@ DEFAULT_PREFERENCE = "-1"
 # Patches submitted upstream are towards top of this list 
 # Hacks should clearly named and at the bottom
 #           ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.14-rc2/2.6.14-rc2-mm1/2.6.14-rc2-mm1.bz2;patch=1 \	   
-SRC_URI = "git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;tag=cbdf811c77cf2906a099b8da92e9f6f335b68a73 \
-           file://rmk-mmc1.patch;patch=1 \
-           file://rmk-mmc2.patch;patch=1 \
+SRC_URI = "git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;tag=553698f944ed715dfe023b4cef07601f0ce735f0 \
+           ${RPSRC}/zlib_inflate-r3.patch;patch=1;status=pending \
+           ${RPSRC}/logo_rotate_fix-r1.patch;patch=1;status=pending \
+           ${RPSRC}/poodle_partsize-r0.patch;patch=1;status=pending \
            ${RPSRC}/mmc_oops_fix-r0.patch;patch=1 \
            ${RPSRC}/mmcsd_large_cards-r0.patch;patch=1 \
+           ${RPSRC}/mmcsd_no_scr_check-r0.patch;patch=1 \
+#           ${RPSRC}/alsa/asoc-v0.10rc8.patch;patch=1 \
            ${RPSRC}/alsa/asoc-v0.10rc4.patch;patch=1 \
+           ${RPSRC}/asoc_fixups-r1.patch;patch=1 \
            ${RPSRC}/hx2750_base-r24.patch;patch=1 \
            ${RPSRC}/hx2750_bl-r5.patch;patch=1 \
            ${RPSRC}/hx2750_pcmcia-r2.patch;patch=1 \
@@ -31,32 +35,28 @@ SRC_URI = "git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.gi
            ${RPSRC}/input_power-r5.patch;patch=1 \
            ${RPSRC}/jffs2_longfilename-r1.patch;patch=1 \
            ${RPSRC}/pxa25x_cpufreq-r0.patch;patch=1 \
-           ${RPSRC}/poodle_partsize-r0.patch;patch=1 \
            ${RPSRC}/collie_frontlight-r4.patch;patch=1 \
-           ${RPSRC}/zlib_inflate-r3.patch;patch=1 \
            ${RPSRC}/zaurus_reboot-r1.patch;patch=1 \
            ${RPSRC}/sharpsl_pm_fixes1-r0.patch;patch=1 \
-           ${RPSRC}/asoc_fixups-r2.patch;patch=1 \
            ${RPSRC}/pm_changes-r1.patch;patch=1 \
-           ${RPSRC}/input_switch_rename-r0.patch;patch=1 \
-           ${RPSRC}/led_class_kconfig-r0.patch;patch=1 \
-           ${RPSRC}/led_maintainer-r0.patch;patch=1 \
-           ${RPSRC}/led_sysfs_fix-r0.patch;patch=1 \
-           ${RPSRC}/backlight_sysfs_fix-r0.patch;patch=1 \
            ${RPSRC}/sharpsl_pm-do-r2.patch;patch=1 \
            ${RPSRC}/usb_pxa27x_udc-r0.patch;patch=1 \
            ${RPSRC}/usb_add_epalloc-r1.patch;patch=1 \
            ${DOSRC}/kexec-arm-r2.patch;patch=1 \
            ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1 \
-           ${RPSRC}/mmcsd_no_scr_check-r0.patch;patch=1 \
            ${RPSRC}/poodle_ts_hack-r0.patch;patch=1 \
            ${RPSRC}/integrator_rgb-r0.patch;patch=1 \
+           ${RPSRC}/logo_oh-r0.patch.bz2;patch=1 \
+           ${RPSRC}/logo_oz-r1.patch.bz2;patch=1 \
            file://add-oz-release-string.patch;patch=1 \
            file://pxa-serial-hack.patch;patch=1 \
            ${RPSRC}/pxa-linking-bug.patch;patch=1 \
            file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \
            file://connectplus-remove-ide-HACK.patch;patch=1 \
            file://24-hostap_cs_id.diff;patch=1 \
+           file://locomo-kbd-hotkeys.patch;patch=1 \
+           file://locomo-sysrq+keyrepeat.patch;patch=1 \
+           file://locomo-lcd-def-bightness.patch;patch=1 \
            file://hrw-pcmcia-ids-r2.patch;patch=1 \
            file://defconfig-c7x0 \
            file://defconfig-ipaq-pxa270 \
@@ -66,7 +66,10 @@ SRC_URI = "git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.gi
            file://defconfig-spitz \
            file://defconfig-qemuarm \
            file://defconfig-tosa "
-	   
+
+# Disabled until I find the reason this gives issues with cdc_subset
+#            ${RPSRC}/usb_rndis_tweaks-r0.patch;patch=1 \
+
 #           http://tglx.de/projects/armirq/2.6.17-rc3/patch-2.6.17-rc3-armirq4.patch;patch=1 \
 #           ${RPSRC}/../pxa27x_overlay-r0.patch;patch=1 \