aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Rigby <john.rigby@linaro.org>2012-12-05 13:20:16 -0700
committerJohn Rigby <john.rigby@linaro.org>2012-12-06 13:51:47 -0700
commit6cbda54a7688f3586155a8e6d93c200505277bf7 (patch)
tree4b5aff672c306c88f04155c3444cc7ba6b2e1937
parentf3b194e8fc663760068e85be74d0007deb2a48c6 (diff)
downloadu-boot-linaro-next-arndale-rebase.tar.gz
EXYNOS: mmc: work around rebase build errorarndale-rebase
Signed-off-by: John Rigby <john.rigby@linaro.org>
-rw-r--r--drivers/mmc/exynos_dw_mmc.c2
-rw-r--r--include/configs/smdk5250.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mmc/exynos_dw_mmc.c b/drivers/mmc/exynos_dw_mmc.c
index fdb62b0..55e13bb 100644
--- a/drivers/mmc/exynos_dw_mmc.c
+++ b/drivers/mmc/exynos_dw_mmc.c
@@ -57,7 +57,7 @@ int exynos_dwmci_init(u32 regbase, int bus_width, int index)
host->dev_index = index;
host->mmc_clk = get_mmc_clk;
- add_dwmci(host, 52000000, 400000, index);
+ add_dwmci(host, 52000000, 400000);
return 0;
}
diff --git a/include/configs/smdk5250.h b/include/configs/smdk5250.h
index fd7ecec..67eac2e 100644
--- a/include/configs/smdk5250.h
+++ b/include/configs/smdk5250.h
@@ -79,8 +79,8 @@
/* SD/MMC configuration */
#define CONFIG_GENERIC_MMC
#define CONFIG_MMC
-#define CONFIG_SDHCI
-#define CONFIG_S5P_SDHCI
+#define CONFIG_DWMMC
+#define CONFIG_EXYNOS_DWMMC
#define CONFIG_BOARD_EARLY_INIT_F