diff options
| author | Gary King <gking@nvidia.com> | 2010-02-15 22:25:45 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@git-master-01.nvidia.com> | 2010-02-15 22:25:45 -0800 |
| commit | 3a67ec3d32ec9217c3e6bdb1b60efdd25911f6f2 (patch) | |
| tree | b26db5ef2706eafcbf1dd211598c43839b2e1aa9 /drivers | |
| parent | cb679e4326860af625ca757ab9a016a9fc7b4949 (diff) | |
| parent | c65c9c103697ba15e9fe8ad7d6544c94c572d16a (diff) | |
Merge "tegra: remove delayed suspend from sdhci driver" into android-tegra-2.6.29
Diffstat (limited to 'drivers')
| -rwxr-xr-x | drivers/mmc/host/sdhci.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 38cace1bfd14..4b0ec72eba1a 100755 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -35,8 +35,6 @@ #define SDHCI_USE_LEDS_CLASS #endif -#define SDHCI_DISABLE_TIMEOUT 50 - static unsigned int debug_quirks = 0; static void sdhci_prepare_data(struct sdhci_host *, struct mmc_data *); @@ -1752,8 +1750,6 @@ int sdhci_add_host(struct sdhci_host *host) mmc->caps |= MMC_CAP_8_BIT_DATA; #ifdef CONFIG_MMC_SDHCI_DYNAMIC_SDMEM_CLOCK mmc->caps |= MMC_CAP_DISABLE; - /* Use delayed suspend */ - mmc_set_disable_delay(mmc, msecs_to_jiffies(SDHCI_DISABLE_TIMEOUT)); #endif mmc->ocr_avail = 0; if (caps & SDHCI_CAN_VDD_330) |