summaryrefslogtreecommitdiff
path: root/board/overo
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2017-05-16 00:17:56 (GMT)
committerTom Rini <trini@konsulko.com>2017-05-16 12:10:50 (GMT)
commit4125bbcef6a998ce8580a1f5c53c8c93a56a125b (patch)
tree291b37802625be36bced91db4f86b158e41c2e13 /board/overo
parentd09ec7f81650425140776995fc9752189ddf7956 (diff)
parentb3125088a3cc362a21aa3bbd0c0e4e74d74a6f2b (diff)
downloadu-boot-4125bbcef6a998ce8580a1f5c53c8c93a56a125b.tar.xz
Merge branch 'master' of git://git.denx.de/u-boot-mmc
- Add #undef CONFIG_DM_MMC_OPS to omap3_logic in the SPL build case, to match other TI platforms in the same situation. Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'board/overo')
-rw-r--r--board/overo/overo.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/board/overo/overo.c b/board/overo/overo.c
index fd441d4..adf33cf 100644
--- a/board/overo/overo.c
+++ b/board/overo/overo.c
@@ -379,14 +379,14 @@ int board_eth_init(bd_t *bis)
}
#endif
-#if defined(CONFIG_GENERIC_MMC)
+#if defined(CONFIG_MMC)
int board_mmc_init(bd_t *bis)
{
return omap_mmc_init(0, 0, 0, -1, -1);
}
#endif
-#if defined(CONFIG_GENERIC_MMC)
+#if defined(CONFIG_MMC)
void board_mmc_power_init(void)
{
twl4030_power_mmc_init(0);