summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Schwarz <simonschwarzcor@googlemail.com>2011-09-30 00:41:33 +0000
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2011-10-27 21:56:30 +0200
commitc9f3cf14e50d7d7ecf09ebda39d39a2b3a3f804d (patch)
treeaa84a35ca04666412d569453aad6ac24f9d0b83f
parentf31a911fe2ceb59a810b295171da7668a9a87c92 (diff)
downloadu-boot-imx-c9f3cf14e50d7d7ecf09ebda39d39a2b3a3f804d.zip
u-boot-imx-c9f3cf14e50d7d7ecf09ebda39d39a2b3a3f804d.tar.gz
u-boot-imx-c9f3cf14e50d7d7ecf09ebda39d39a2b3a3f804d.tar.bz2
devkit8000: protect board_mmc_init
This function is also defined in omap-common/spl_mmc.de so the implementation in devkit8000.c was protected by a ifdef. Signed-off-by: Simon Schwarz <simonschwarzcor@gmail.com>
-rw-r--r--board/timll/devkit8000/devkit8000.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/board/timll/devkit8000/devkit8000.c b/board/timll/devkit8000/devkit8000.c
index f50d113..fee0dff 100644
--- a/board/timll/devkit8000/devkit8000.c
+++ b/board/timll/devkit8000/devkit8000.c
@@ -120,7 +120,7 @@ void set_muxconf_regs(void)
MUX_DEVKIT8000();
}
-#ifdef CONFIG_GENERIC_MMC
+#if defined(CONFIG_GENERIC_MMC) && !defined(CONFIG_SPL_BUILD)
int board_mmc_init(bd_t *bis)
{
omap_mmc_init(0);