diff options
| author | ScottPeterson <speterson@nvidia.com> | 2011-03-11 11:00:25 -0800 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-04-26 15:53:33 -0700 |
| commit | 4fa83df984630c855f3e1c7c9d7b8f9f036cf426 (patch) | |
| tree | 5e978058f74d0a2ac3949fdb958f27359bdfe6cb /drivers/mmc/host/sdhci-tegra.c | |
| parent | ad364a34bfbbe3cb3a7c8e123407301ab864ecc5 (diff) | |
arm:tegra:sdhci Ventana build break fix
Fix build break on ventana due to improper use
of kernel config paramters.
Original-Change-Id: If6f54e1f305e960f8bf935058f48b0e77adce6c6
Reviewed-on: http://git-master/r/22639
Reviewed-by: Scott Peterson <speterson@nvidia.com>
Tested-by: Scott Peterson <speterson@nvidia.com>
Reviewed-by: Scott Williams <scwilliams@nvidia.com>
Change-Id: Ia78069e7c3413e031dcb2df61216bfb577a693b5
Diffstat (limited to 'drivers/mmc/host/sdhci-tegra.c')
| -rw-r--r-- | drivers/mmc/host/sdhci-tegra.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c index bfb878839483..2a65eddc0270 100644 --- a/drivers/mmc/host/sdhci-tegra.c +++ b/drivers/mmc/host/sdhci-tegra.c @@ -185,7 +185,9 @@ static void tegra_sdhci_set_signalling_voltage(struct sdhci_host *sdhci, struct tegra_sdhci_host *host = sdhci_priv(sdhci); unsigned int minV = 3280000; unsigned int maxV = 3320000; +#if defined (CONFIG_ARCH_TEGRA_3x_SOC) unsigned int val; +#endif unsigned int rc; if (signalling_voltage == MMC_1_8_VOLT_SIGNALLING) { @@ -198,14 +200,15 @@ static void tegra_sdhci_set_signalling_voltage(struct sdhci_host *sdhci, printk(KERN_ERR "%s switching to %dV failed %d\n", mmc_hostname(sdhci->mmc), (maxV/1000000), rc); else { -#if CONFIG_ARCH_TEGRA_3x_SOC +#if defined (CONFIG_ARCH_TEGRA_3x_SOC) if (signalling_voltage == MMC_1_8_VOLT_SIGNALLING) { /* Do Auto Calibration */ val = sdhci_readl(sdhci, SDMMC_AUTO_CAL_CONFIG); val |= SDMMC_AUTO_CAL_CONFIG_AUTO_CAL_ENABLE; sdhci_writel(sdhci, val, SDMMC_AUTO_CAL_CONFIG); -#endif + } +#endif } } |