diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2010-01-19 10:02:16 +0100 |
|---|---|---|
| committer | Lars-Peter Clausen <lars@metafoo.de> | 2010-01-19 10:02:16 +0100 |
| commit | 058cbf4220fd2f1cd970bf553c044cb178e3804e (patch) | |
| tree | 257359e5c1f99ae66907d8e54339870abf1f00d4 | |
| parent | 5827b20d022fb47ce9c9731d0fb894d361e16ffe (diff) | |
| parent | a1e601e290a9887c68cc64833d7645ed62bc8d7a (diff) | |
Merge branch 'om-s3c-2.6.32' into om-gta02-2.6.32
| -rw-r--r-- | drivers/mmc/host/s3cmci.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c index 99b74a35102..f3d1b94c1fb 100644 --- a/drivers/mmc/host/s3cmci.c +++ b/drivers/mmc/host/s3cmci.c @@ -1361,6 +1361,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 reaonable defaults are picked. */ + .no_detect = 1, + .no_wprotect = 1, }; #ifdef CONFIG_CPU_FREQ |