summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2011-06-09 16:56:27 -0700
committerColin Cross <ccross@android.com>2011-06-09 16:56:27 -0700
commit1dfd911585f4376e4859db0fbb26b8fb39cf0951 (patch)
tree39336075758830542f24996d078d7f0acce04954 /drivers
parentff4ab57e13148d97951a98a025a920eb4c672368 (diff)
parent4e23026659afa907f00e24c6061ca2bd052d772d (diff)
Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mmc/host/sdhci-tegra.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c
index 153bd9a16dd9..1ccd8c70ab14 100644
--- a/drivers/mmc/host/sdhci-tegra.c
+++ b/drivers/mmc/host/sdhci-tegra.c
@@ -143,6 +143,9 @@ static int __devinit tegra_sdhci_probe(struct platform_device *pdev)
if (plat->force_hs != 0)
sdhci->quirks |= SDHCI_QUIRK_FORCE_HIGH_SPEED_MODE;
+ if (plat->rt_disable != 0)
+ sdhci->quirks |= SDHCI_QUIRK_RUNTIME_DISABLE;
+
rc = sdhci_add_host(sdhci);
if (rc)
goto err_clk_disable;