Merge branch 'master' of git://git.denx.de/u-boot-mmc

[platform/kernel/u-boot.git] / board / quipos / cairo / cairo.c

diff --git a/board/quipos/cairo/cairo.c b/board/quipos/cairo/cairo.c
index 6b366dc..6cf5409 100644 (file)
--- a/board/quipos/cairo/cairo.c
+++ b/board/quipos/cairo/cairo.c
@@ -26,18 +26,6 @@
 DECLARE_GLOBAL_DATA_PTR;
 
 /*
- * MUSB port on OMAP3EVM Rev >= E requires extvbus programming.
- */
-u8 omap3_evm_need_extvbus(void)
-{
-       u8 retval = 0;
-
-       /* TODO: verify if cairo handheld platform needs extvbus programming */
-
-       return retval;
-}
-
-/*
  * Routine: board_init
  * Description: Early hardware init.
  */
@@ -62,7 +50,7 @@ void set_muxconf_regs(void)
        MUX_CAIRO();
 }
 
-#if defined(CONFIG_GENERIC_MMC) && !defined(CONFIG_SPL_BUILD)
+#if defined(CONFIG_MMC)
 int board_mmc_init(bd_t *bis)
 {
        return omap_mmc_init(0, 0, 0, -1, -1);