remove a .32 patch

diff --git a/queue-2.6.32/s3cmci-initialize-default-platform-data-no_wprotect-and-no_detect-with-1.patch b/queue-2.6.32/s3cmci-initialize-default-platform-data-no_wprotect-and-no_detect-with-1.patch
deleted file mode 100644 (file)
index ccd2746..0000000
--- a/queue-2.6.32/s3cmci-initialize-default-platform-data-no_wprotect-and-no_detect-with-1.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From c212808a1ba6bfba489006399b8152a047305acf Mon Sep 17 00:00:00 2001
-From: Lars-Peter Clausen <lars@metafoo.de>
-Date: Fri, 5 Mar 2010 13:43:35 -0800
-Subject: s3cmci: initialize default platform data no_wprotect and no_detect with 1
-
-From: Lars-Peter Clausen <lars@metafoo.de>
-
-commit c212808a1ba6bfba489006399b8152a047305acf upstream.
-
-If no platform_data was givin to the device it's going to use it's default
-platform data struct which has all fields initialized to zero.  As a
-result the driver is going to try to request gpio0 both as write protect
-and card detect pin.  Which of course will fail and makes the driver
-unusable
-
-Previously to the introduction of no_wprotect and no_detect the behavior
-was to assume that if no platform data was given there is no write protect
-or card detect pin.  This patch restores that behavior.
-
-Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
-Cc: Ben Dooks <ben-linux@fluff.org>
-Cc: <linux-mmc@vger.kernel.org>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
---- a/drivers/mmc/host/s3cmci.c
-+++ b/drivers/mmc/host/s3cmci.c
-@@ -1360,6 +1360,8 @@ 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 reasonable defaults are picked. */
-+       .no_wprotect = 1,
-+       .no_detect = 1,
- };
- 
- #ifdef CONFIG_CPU_FREQ

diff --git a/queue-2.6.32/series b/queue-2.6.32/series
index beca8e04e874104009172361ed6a0a5a268d4334..eee217356e277bc2add1e7ae28a3dc552c02ecc2 100644 (file)
--- a/queue-2.6.32/series
+++ b/queue-2.6.32/series
@@ -140,7 +140,6 @@ kvm-x86-emulator-forbid-modifying-cs-segment-register-by-mov-instruction.patch
 kvm-x86-emulator-add-group9-instruction-decoding.patch
 kvm-x86-emulator-fix-popf-emulation.patch
 kvm-x86-emulator-check-cpl-level-during-privilege-instruction-emulation.patch
-s3cmci-initialize-default-platform-data-no_wprotect-and-no_detect-with-1.patch
 sched-fix-sched_mv_power_savings-for-smt.patch
 sched-fix-smt-scheduler-regression-in-find_busiest_queue.patch
 sched-don-t-use-possibly-stale-sched_class.patch