Merge git://git.denx.de/u-boot-samsung

[oweals/u-boot.git] / board / teejet / mt_ventoux / mt_ventoux.c

diff --git a/board/teejet/mt_ventoux/mt_ventoux.c b/board/teejet/mt_ventoux/mt_ventoux.c
index b4a0a72bd0fec0bea8e049ffba7adedd4f6ca5b5..6b05541964ccf5d2a4fb226221823199f056c048 100644 (file)
--- a/board/teejet/mt_ventoux/mt_ventoux.c
+++ b/board/teejet/mt_ventoux/mt_ventoux.c
@@ -257,7 +257,7 @@ int misc_init_r(void)
        int ret;
 
        TAM3517_READ_EEPROM(&info, ret);
-       dieid_num_r();
+       omap_die_id_display();
 
        if (ret)
                return 0;
@@ -291,7 +291,7 @@ int board_eth_init(bd_t *bis)
        return 0;
 }
 
-#if defined(CONFIG_OMAP_HSMMC) && \
+#if defined(CONFIG_MMC_OMAP_HS) && \
        !defined(CONFIG_SPL_BUILD)
 int board_mmc_init(bd_t *bis)
 {