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.

14 files changed, 6 insertions, 6 deletions

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
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-openzaurus-2.6.14-rc1-mm1/.mtn2git_empty
+++ b/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
index 04ab185f4f..04ab185f4f 100644
--- 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
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
index 22a6fd3943..22a6fd3943 100644
--- 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
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
index 4414b21191..4414b21191 100644
--- 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
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
index 9dd7c230e7..9dd7c230e7 100644
--- a/packages/linux/linux-openzaurus-2.6.14-rc1-mm1/defconfig-c7x0
+++ b/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
index 9f51b61169..9f51b61169 100644
--- a/packages/linux/linux-openzaurus-2.6.14-rc1-mm1/defconfig-collie
+++ b/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
index 8b41380784..8b41380784 100644
--- 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
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
index a0810f8381..a0810f8381 100644
--- a/packages/linux/linux-openzaurus-2.6.14-rc1-mm1/defconfig-poodle
+++ b/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
index f838a497a3..f838a497a3 100644
--- a/packages/linux/linux-openzaurus-2.6.14-rc1-mm1/defconfig-spitz
+++ b/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
index dd1e70fa03..dd1e70fa03 100644
--- a/packages/linux/linux-openzaurus-2.6.14-rc1-mm1/defconfig-tosa
+++ b/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
index 9fe3bd06d3..9fe3bd06d3 100644
--- 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
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
index 7892a0f929..7892a0f929 100644
--- 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
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
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 \