diff options
| author | Bo Yan <byan@nvidia.com> | 2012-07-31 11:03:18 -0700 |
|---|---|---|
| committer | Simone Willett <swillett@nvidia.com> | 2012-08-02 16:28:15 -0700 |
| commit | c0db33df893eef40ce45787e7c827e4ea1a22f29 (patch) | |
| tree | 2daa16e1ebf4725bcac614234fd750a0bb5174f0 | |
| parent | c92083e495f63ecb22140602fba5805698900d72 (diff) | |
mmc: tegra: Fix build break
Fix build break due to misplaced conditional compilation macros
Change-Id: I1ed554a25a9123c94d85c08371a77350292b58e5
Signed-off-by: Bo Yan <byan@nvidia.com>
Reviewed-on: http://git-master/r/119725
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Naveen Kumar Arepalli <naveenk@nvidia.com>
| -rw-r--r-- | drivers/mmc/host/sdhci-tegra.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c index d8a24783d2f5..03406a05d4e7 100644 --- a/drivers/mmc/host/sdhci-tegra.c +++ b/drivers/mmc/host/sdhci-tegra.c @@ -86,9 +86,10 @@ static void tegra3_sdhci_post_reset_init(struct sdhci_host *sdhci); static void tegra11x_sdhci_post_reset_init(struct sdhci_host *sdhci); #endif -#ifndef CONFIG_ARCH_TEGRA_2x_SOC static unsigned int tegra_sdhost_min_freq; static unsigned int tegra_sdhost_std_freq; + +#ifndef CONFIG_ARCH_TEGRA_2x_SOC static unsigned int tegra3_sdhost_max_clk[4] = { 208000000, 104000000, 208000000, 104000000 }; #endif @@ -228,6 +229,7 @@ static unsigned int tegra_sdhci_get_ro(struct sdhci_host *sdhci) return gpio_get_value(plat->wp_gpio); } +#if defined(CONFIG_ARCH_TEGRA_3x_SOC) static void tegra3_sdhci_post_reset_init(struct sdhci_host *sdhci) { u16 misc_ctrl; @@ -262,6 +264,7 @@ static void tegra3_sdhci_post_reset_init(struct sdhci_host *sdhci) SDHCI_VENDOR_MISC_CNTRL_ENABLE_SDR50_SUPPORT; sdhci_writew(sdhci, misc_ctrl, SDHCI_VENDOR_MISC_CNTRL); } +#endif #ifdef CONFIG_ARCH_TEGRA_11x_SOC static void tegra11x_sdhci_post_reset_init(struct sdhci_host *sdhci) |