From 499e98b67f95066802b79537c7c692e1a9a17c46 Mon Sep 17 00:00:00 2001
From: Lars-Peter Clausen <lars@metafoo.de>
Date: Fri, 5 Mar 2010 13:43:35 -0800
Subject: [PATCH] --- yaml --- r: 186289 b: refs/heads/master c:
 c212808a1ba6bfba489006399b8152a047305acf h: refs/heads/master i:   186287:
 e412dca301af80555374ce2166c83e2e1efae81a v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/mmc/host/s3cmci.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ec4b7be398ca..a09be87a4f5c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6b5eda369ac3772dad416ef96d86064204d74770
+refs/heads/master: c212808a1ba6bfba489006399b8152a047305acf
diff --git a/trunk/drivers/mmc/host/s3cmci.c b/trunk/drivers/mmc/host/s3cmci.c
index d96e1abf2d64..b9c96cc87b04 100644
--- a/trunk/drivers/mmc/host/s3cmci.c
+++ b/trunk/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