summaryrefslogtreecommitdiff
path: root/board/ti/panda
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2017-05-15 20:17:56 -0400
committerTom Rini <trini@konsulko.com>2017-05-16 08:10:50 -0400
commit4125bbcef6a998ce8580a1f5c53c8c93a56a125b (patch)
tree291b37802625be36bced91db4f86b158e41c2e13 /board/ti/panda
parentd09ec7f81650425140776995fc9752189ddf7956 (diff)
parentb3125088a3cc362a21aa3bbd0c0e4e74d74a6f2b (diff)
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/ti/panda')
-rw-r--r--board/ti/panda/panda.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/board/ti/panda/panda.c b/board/ti/panda/panda.c
index 5822366448..72aabb242c 100644
--- a/board/ti/panda/panda.c
+++ b/board/ti/panda/panda.c
@@ -287,7 +287,7 @@ void set_muxconf_regs(void)
sizeof(struct pad_conf_entry));
}
-#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);