From b4083296ca96b9cd5094f560262bf6300e6c0b03 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 23 Sep 2005 10:42:23 +0000 Subject: [PATCH] linux-oz-2.6: Add a fix for spitz resuming the backlight whilst performing charging operations and suspended. Upgrade development series to 2.6.14-rc2-mm1. Testing of -mm kernel welcome - untested as yet but can't be more broken than it was. --- .../.mtn2git_empty | 0 .../add-elpp-stuff.patch | 0 .../add-oz-release-string.patch | 0 .../connectplus-remove-ide-HACK.patch | 0 .../defconfig-c7x0 | 0 .../defconfig-collie | 0 .../defconfig-ipaq-pxa-2.6 | 0 .../defconfig-poodle | 0 .../defconfig-spitz | 0 .../defconfig-tosa | 0 .../dtl1_cs-add-socket-revE.patch | 0 .../pxa-serial-hack.patch | 0 packages/linux/linux-openzaurus_2.6.14-rc1.bb | 2 +- ...4-rc1-mm1.bb => linux-openzaurus_2.6.14-rc2-mm1.bb} | 10 +++++----- 14 files changed, 6 insertions(+), 6 deletions(-) rename packages/linux/{linux-openzaurus-2.6.14-rc1-mm1 => linux-openzaurus-2.6.14-rc2-mm1}/.mtn2git_empty (100%) rename packages/linux/{linux-openzaurus-2.6.14-rc1-mm1 => linux-openzaurus-2.6.14-rc2-mm1}/add-elpp-stuff.patch (100%) rename packages/linux/{linux-openzaurus-2.6.14-rc1-mm1 => linux-openzaurus-2.6.14-rc2-mm1}/add-oz-release-string.patch (100%) rename packages/linux/{linux-openzaurus-2.6.14-rc1-mm1 => linux-openzaurus-2.6.14-rc2-mm1}/connectplus-remove-ide-HACK.patch (100%) rename packages/linux/{linux-openzaurus-2.6.14-rc1-mm1 => linux-openzaurus-2.6.14-rc2-mm1}/defconfig-c7x0 (100%) rename packages/linux/{linux-openzaurus-2.6.14-rc1-mm1 => linux-openzaurus-2.6.14-rc2-mm1}/defconfig-collie (100%) rename packages/linux/{linux-openzaurus-2.6.14-rc1-mm1 => linux-openzaurus-2.6.14-rc2-mm1}/defconfig-ipaq-pxa-2.6 (100%) rename packages/linux/{linux-openzaurus-2.6.14-rc1-mm1 => linux-openzaurus-2.6.14-rc2-mm1}/defconfig-poodle (100%) rename packages/linux/{linux-openzaurus-2.6.14-rc1-mm1 => linux-openzaurus-2.6.14-rc2-mm1}/defconfig-spitz (100%) rename packages/linux/{linux-openzaurus-2.6.14-rc1-mm1 => linux-openzaurus-2.6.14-rc2-mm1}/defconfig-tosa (100%) rename packages/linux/{linux-openzaurus-2.6.14-rc1-mm1 => linux-openzaurus-2.6.14-rc2-mm1}/dtl1_cs-add-socket-revE.patch (100%) rename packages/linux/{linux-openzaurus-2.6.14-rc1-mm1 => linux-openzaurus-2.6.14-rc2-mm1}/pxa-serial-hack.patch (100%) rename packages/linux/{linux-openzaurus_2.6.14-rc1-mm1.bb => linux-openzaurus_2.6.14-rc2-mm1.bb} (95%) diff --git a/packages/linux/linux-openzaurus-2.6.14-rc1-mm1/.mtn2git_empty b/packages/linux/linux-openzaurus-2.6.14-rc2-mm1/.mtn2git_empty similarity index 100% rename from packages/linux/linux-openzaurus-2.6.14-rc1-mm1/.mtn2git_empty rename to packages/linux/linux-openzaurus-2.6.14-rc2-mm1/.mtn2git_empty diff --git a/packages/linux/linux-openzaurus-2.6.14-rc1-mm1/add-elpp-stuff.patch b/packages/linux/linux-openzaurus-2.6.14-rc2-mm1/add-elpp-stuff.patch similarity index 100% rename from packages/linux/linux-openzaurus-2.6.14-rc1-mm1/add-elpp-stuff.patch rename to packages/linux/linux-openzaurus-2.6.14-rc2-mm1/add-elpp-stuff.patch diff --git a/packages/linux/linux-openzaurus-2.6.14-rc1-mm1/add-oz-release-string.patch b/packages/linux/linux-openzaurus-2.6.14-rc2-mm1/add-oz-release-string.patch similarity index 100% rename from packages/linux/linux-openzaurus-2.6.14-rc1-mm1/add-oz-release-string.patch rename to packages/linux/linux-openzaurus-2.6.14-rc2-mm1/add-oz-release-string.patch diff --git a/packages/linux/linux-openzaurus-2.6.14-rc1-mm1/connectplus-remove-ide-HACK.patch b/packages/linux/linux-openzaurus-2.6.14-rc2-mm1/connectplus-remove-ide-HACK.patch similarity index 100% rename from packages/linux/linux-openzaurus-2.6.14-rc1-mm1/connectplus-remove-ide-HACK.patch rename to packages/linux/linux-openzaurus-2.6.14-rc2-mm1/connectplus-remove-ide-HACK.patch diff --git a/packages/linux/linux-openzaurus-2.6.14-rc1-mm1/defconfig-c7x0 b/packages/linux/linux-openzaurus-2.6.14-rc2-mm1/defconfig-c7x0 similarity index 100% rename from packages/linux/linux-openzaurus-2.6.14-rc1-mm1/defconfig-c7x0 rename to packages/linux/linux-openzaurus-2.6.14-rc2-mm1/defconfig-c7x0 diff --git a/packages/linux/linux-openzaurus-2.6.14-rc1-mm1/defconfig-collie b/packages/linux/linux-openzaurus-2.6.14-rc2-mm1/defconfig-collie similarity index 100% rename from packages/linux/linux-openzaurus-2.6.14-rc1-mm1/defconfig-collie rename to packages/linux/linux-openzaurus-2.6.14-rc2-mm1/defconfig-collie diff --git a/packages/linux/linux-openzaurus-2.6.14-rc1-mm1/defconfig-ipaq-pxa-2.6 b/packages/linux/linux-openzaurus-2.6.14-rc2-mm1/defconfig-ipaq-pxa-2.6 similarity index 100% rename from packages/linux/linux-openzaurus-2.6.14-rc1-mm1/defconfig-ipaq-pxa-2.6 rename to packages/linux/linux-openzaurus-2.6.14-rc2-mm1/defconfig-ipaq-pxa-2.6 diff --git a/packages/linux/linux-openzaurus-2.6.14-rc1-mm1/defconfig-poodle b/packages/linux/linux-openzaurus-2.6.14-rc2-mm1/defconfig-poodle similarity index 100% rename from packages/linux/linux-openzaurus-2.6.14-rc1-mm1/defconfig-poodle rename to packages/linux/linux-openzaurus-2.6.14-rc2-mm1/defconfig-poodle diff --git a/packages/linux/linux-openzaurus-2.6.14-rc1-mm1/defconfig-spitz b/packages/linux/linux-openzaurus-2.6.14-rc2-mm1/defconfig-spitz similarity index 100% rename from packages/linux/linux-openzaurus-2.6.14-rc1-mm1/defconfig-spitz rename to packages/linux/linux-openzaurus-2.6.14-rc2-mm1/defconfig-spitz diff --git a/packages/linux/linux-openzaurus-2.6.14-rc1-mm1/defconfig-tosa b/packages/linux/linux-openzaurus-2.6.14-rc2-mm1/defconfig-tosa similarity index 100% rename from packages/linux/linux-openzaurus-2.6.14-rc1-mm1/defconfig-tosa rename to packages/linux/linux-openzaurus-2.6.14-rc2-mm1/defconfig-tosa diff --git a/packages/linux/linux-openzaurus-2.6.14-rc1-mm1/dtl1_cs-add-socket-revE.patch b/packages/linux/linux-openzaurus-2.6.14-rc2-mm1/dtl1_cs-add-socket-revE.patch similarity index 100% rename from packages/linux/linux-openzaurus-2.6.14-rc1-mm1/dtl1_cs-add-socket-revE.patch rename to packages/linux/linux-openzaurus-2.6.14-rc2-mm1/dtl1_cs-add-socket-revE.patch diff --git a/packages/linux/linux-openzaurus-2.6.14-rc1-mm1/pxa-serial-hack.patch b/packages/linux/linux-openzaurus-2.6.14-rc2-mm1/pxa-serial-hack.patch similarity index 100% rename from packages/linux/linux-openzaurus-2.6.14-rc1-mm1/pxa-serial-hack.patch rename to packages/linux/linux-openzaurus-2.6.14-rc2-mm1/pxa-serial-hack.patch diff --git a/packages/linux/linux-openzaurus_2.6.14-rc1.bb b/packages/linux/linux-openzaurus_2.6.14-rc1.bb index 3b374340cc..2fa4a89012 100644 --- a/packages/linux/linux-openzaurus_2.6.14-rc1.bb +++ b/packages/linux/linux-openzaurus_2.6.14-rc1.bb @@ -32,7 +32,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \ ${RPSRC}/sharpsl_pm-r8.patch;patch=1 \ ${RPSRC}/corgi_pm-r3.patch;patch=1 \ ${RPSRC}/spitz_base_extras-r2.patch;patch=1 \ - ${RPSRC}/spitz_pm-r3.patch;patch=1 \ + ${RPSRC}/spitz_pm-r4.patch;patch=1 \ ${RPSRC}/spitz_kbd_fix1-r0.patch;patch=1 \ ${RPSRC}/spitzcf-r3.patch;patch=1 \ ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \ diff --git a/packages/linux/linux-openzaurus_2.6.14-rc1-mm1.bb b/packages/linux/linux-openzaurus_2.6.14-rc2-mm1.bb similarity index 95% rename from packages/linux/linux-openzaurus_2.6.14-rc1-mm1.bb rename to packages/linux/linux-openzaurus_2.6.14-rc2-mm1.bb index c266d8bf03..586aad7abd 100644 --- a/packages/linux/linux-openzaurus_2.6.14-rc1-mm1.bb +++ b/packages/linux/linux-openzaurus_2.6.14-rc2-mm1.bb @@ -25,23 +25,23 @@ DEFAULT_PREFERENCE = "-1" # ${RPSRC}/sharpsl_mtd_extras-r1.patch;patch=1 \ # ${RPSRC}/ohci_portcount-r0.patch;patch=1 \ # ${RPSRC}/pxa_ohci_power-r0.patch;patch=1 \ +# ${RPSRC}/pcmcia_really_resume-r0.patch;patch=1 \ # Patches submitted upstream are towards top of this list # Hacks should clearly named and at the bottom SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \ - ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.14-rc1.bz2;patch=1 \ - ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.14-rc1/2.6.14-rc1-mm1/2.6.14-rc1-mm1.bz2;patch=1 \ + ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.14-rc2.bz2;patch=1 \ + 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 \ ${RPSRC}/borzoi_machtype-r0.patch;patch=1 \ ${RPSRC}/poodle_irda-r0.patch;patch=1 \ ${RPSRC}/pxa_i2c_fixes-r1.patch;patch=1 \ - ${RPSRC}/pcmcia_really_resume-r0.patch;patch=1 \ ${RPSRC}/pxa_ohci_platform-r1.patch;patch=1 \ ${RPSRC}/pxa_ohci_suspend-r0.patch;patch=1 \ ${RPSRC}/sharpsl_pm-r8.patch;patch=1 \ ${RPSRC}/ide_not_removable-r0.patch;patch=1 \ ${RPSRC}/corgi_pm-r3.patch;patch=1 \ ${RPSRC}/spitz_base_extras-r2.patch;patch=1 \ - ${RPSRC}/spitz_pm-r3.patch;patch=1 \ + ${RPSRC}/spitz_pm-r4.patch;patch=1 \ ${RPSRC}/spitz_kbd_fix1-r0.patch;patch=1 \ ${RPSRC}/spitzcf-r3.patch;patch=1 \ ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \ @@ -50,7 +50,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \ ${RPSRC}/corgi_irda-r3.patch;patch=1 \ ${RPSRC}/pxa_rtc-r1.patch;patch=1 \ ${RPSRC}/scoop_susres-r1.patch;patch=1 \ - ${RPSRC}/input_power-r3.patch;patch=1 \ + ${RPSRC}/input_power-r2.patch;patch=1 \ ${RPSRC}/jffs2_longfilename-r0.patch;patch=1 \ ${RPSRC}/sharpsl_bl_kick-r1.patch;patch=1 \ ${RPSRC}/corgi_snd-r10.patch;patch=1 \ -- 2.39.5