diff options
| author | Colin Cross <ccross@android.com> | 2010-10-20 14:39:20 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2010-10-20 14:39:20 -0700 |
| commit | 4ab096ce9c6532f3876d1cbb71462f7a7101003b (patch) | |
| tree | ceadc8a8f4f719d48c0ffe130df0c4df58a443e5 /drivers/mmc | |
| parent | ae9a66ccf4bfcac9b6085cf9d62955f2712f82db (diff) | |
| parent | 0b313530b3fa263c5537a55703948a980f333388 (diff) | |
Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
Conflicts:
arch/arm/mach-tegra/tegra_i2s_audio.c
Change-Id: I3e05a70e3fb8fdaa8ca4c5ed78ca020c75ed0caa
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/sdhci.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 6709cfb5d4e8..61670e1534b0 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -1871,6 +1871,8 @@ int sdhci_add_host(struct sdhci_host *host) if (host->quirks & SDHCI_QUIRK_BROKEN_CARD_DETECTION) mmc->caps |= MMC_CAP_NEEDS_POLL; + mmc->caps |= MMC_CAP_ERASE; + mmc->ocr_avail = 0; if (caps & SDHCI_CAN_VDD_330) mmc->ocr_avail |= MMC_VDD_32_33|MMC_VDD_33_34; |