From: Simon Schwarz <simonschwarzcor@googlemail.com>
Date: Fri, 30 Sep 2011 00:41:33 +0000 (+0000)
Subject: devkit8000: protect board_mmc_init
X-Git-Tag: v2011.12-rc1~343^2~77
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c9f3cf14e50d7d7ecf09ebda39d39a2b3a3f804d;p=u-boot

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>
---

diff --git a/board/timll/devkit8000/devkit8000.c b/board/timll/devkit8000/devkit8000.c
index f50d113347..fee0dff33c 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);