diff options
| author | Daniel Hillenbrand <codeworkx@cyanogenmod.org> | 2013-08-10 18:35:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2013-08-10 18:35:28 +0000 |
| commit | ac24bebb064fa1d51829b62b2b7fbecdaf11c0d0 (patch) | |
| tree | ff75fb5eaaac92a7a414aaa0f778631fc47e6fc2 | |
| parent | 06b6513043b7c39692dbd5e041e5b3fe194a1897 (diff) | |
| parent | 7625c997f40f82b0aba169da7916ebf0caf28982 (diff) | |
| download | kernel_samsung_smdk4412-ac24bebb064fa1d51829b62b2b7fbecdaf11c0d0.zip kernel_samsung_smdk4412-ac24bebb064fa1d51829b62b2b7fbecdaf11c0d0.tar.gz kernel_samsung_smdk4412-ac24bebb064fa1d51829b62b2b7fbecdaf11c0d0.tar.bz2 | |
Merge "mshci: disable MMC_CAP_ERASE on u1" into cm-10.1
| -rw-r--r-- | drivers/mmc/host/mshci.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/mmc/host/mshci.c b/drivers/mmc/host/mshci.c index 45997c5..f93a7eb 100644 --- a/drivers/mmc/host/mshci.c +++ b/drivers/mmc/host/mshci.c @@ -2045,7 +2045,11 @@ int mshci_add_host(struct mshci_host *host) mmc->ops = &mshci_ops; mmc->f_min = 400000; mmc->f_max = host->max_clk; +#ifdef CONFIG_MACH_U1 + mmc->caps |= MMC_CAP_SDIO_IRQ; +#else mmc->caps |= MMC_CAP_SDIO_IRQ | MMC_CAP_ERASE; +#endif mmc->caps |= MMC_CAP_4_BIT_DATA; |