[oe-commits] Martin Jansa : linux-openmoko-2.6.32: move to 2.6.32.11

[git version control]

Module: openembedded.git
Branch: shr/unstable
Commit: bfcb89273ca346630add169c3141277f6e34dcc9
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=bfcb89273ca346630add169c3141277f6e34dcc9

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Wed Apr  7 10:14:59 2010 +0200

linux-openmoko-2.6.32: move to 2.6.32.11

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 ...ci-initialize-default-platform-data-no_wp.patch |   26 ++++++++++++++++++++
 recipes/linux/linux-openmoko-2.6.32_git.bb         |    7 +++--
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/recipes/linux/linux-openmoko-2.6.32/0001-Revert-s3cmci-initialize-default-platform-data-no_wp.patch b/recipes/linux/linux-openmoko-2.6.32/0001-Revert-s3cmci-initialize-default-platform-data-no_wp.patch
new file mode 100644
index 0000000..dd7053e
--- /dev/null
+++ b/recipes/linux/linux-openmoko-2.6.32/0001-Revert-s3cmci-initialize-default-platform-data-no_wp.patch
@@ -0,0 +1,26 @@
+From 58cf346d1298e885cf81c864d99a652523cda921 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa at gmail.com>
+Date: Wed, 7 Apr 2010 10:08:34 +0200
+Subject: [PATCH 01/18] Revert: s3cmci: initialize default platform data no_wprotect and no_detect with 1
+
+* already applied upstream and included in stable patch 2.6.32.11
+---
+ drivers/mmc/host/s3cmci.c |    2 --
+ 1 files changed, 0 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c
+index f3d1b94..99b74a3 100644
+--- a/drivers/mmc/host/s3cmci.c
++++ b/drivers/mmc/host/s3cmci.c
+@@ -1361,8 +1361,6 @@ static struct mmc_host_ops s3cmci_ops = {
+ static struct s3c24xx_mci_pdata s3cmci_def_pdata = {
+ 	/* This is currently here to avoid a number of if (host->pdata)
+ 	 * checks. Any zero fields to ensure reaonable defaults are picked. */
+-	.no_detect = 1,
+-	.no_wprotect = 1,
+ };
+ 
+ #ifdef CONFIG_CPU_FREQ
+-- 
+1.7.0.3
+
diff --git a/recipes/linux/linux-openmoko-2.6.32_git.bb b/recipes/linux/linux-openmoko-2.6.32_git.bb
index da3e03f..9546827 100644
--- a/recipes/linux/linux-openmoko-2.6.32_git.bb
+++ b/recipes/linux/linux-openmoko-2.6.32_git.bb
@@ -3,7 +3,7 @@ require linux-openmoko.inc
 
 DESCRIPTION_${PN} = "Linux ${KERNEL_RELEASE} kernel for the Openmoko Neo GSM Smartphones"
 
-KERNEL_RELEASE="2.6.32.10"
+KERNEL_RELEASE="2.6.32.11"
 
 SRCREV = "14be1091928fcce66812a85129768fb253b36420"
 OEV = "oe1"
@@ -12,6 +12,7 @@ PR = "r5"
 
 SRC_URI = "\
   git://git.openmoko.org/git/kernel.git;protocol=git;branch=om-gta02-2.6.32 \
+  file://0001-Revert-s3cmci-initialize-default-platform-data-no_wp.patch;patch=1 \
 # latest stable patch for ubi fix 943e167cb3e8fb191894bde8a4a75db78531a7c8
   ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${KERNEL_RELEASE}.bz2;patch=1;name=stablepatch \
   file://defconfig \
@@ -35,8 +36,8 @@ SRC_URI = "\
   file://0016-Enable-display-before-trying-to-set-mode-or-base.patch;patch=1 \
 "
 
-SRC_URI[stablepatch.md5sum] = "0f1863836bf96fd0aab128d61eaa5693"
-SRC_URI[stablepatch.sha256sum] = "e4b760254822dbc77ae1889d0b2078c113cb7939f8c6ee31c49a31b07b52cc18"
+SRC_URI[stablepatch.md5sum] = "855c248334a71ef5ca3d8cb89d51334f"
+SRC_URI[stablepatch.sha256sum] = "edb26ff62b2f95b0d6e5c434d777af2815600a990f1c7c5d2c7faad9b4e4bc2b"
 
 
 S = "${WORKDIR}/git"