Merge remote-tracking branch 'u-boot-ti/master'

[u-boot] / arch / arm / cpu / armv7 / am33xx / board.c

diff --git a/arch/arm/cpu/armv7/am33xx/board.c b/arch/arm/cpu/armv7/am33xx/board.c
index 8280b3550894ad42da5d4b50ae15e480c218af25..e4c123cd21d614f3b2bee6a3aabf6a9e5288be56 100644 (file)
--- a/arch/arm/cpu/armv7/am33xx/board.c
+++ b/arch/arm/cpu/armv7/am33xx/board.c
@@ -46,10 +46,10 @@ static const struct gpio_bank gpio_bank_am33xx[4] = {
 const struct gpio_bank *const omap_gpio_bank = gpio_bank_am33xx;
 
 #if defined(CONFIG_OMAP_HSMMC) && !defined(CONFIG_SPL_BUILD)
-int board_mmc_init(bd_t *bis)
+int cpu_mmc_init(bd_t *bis)
 {
        int ret;
-       
+
        ret = omap_mmc_init(0, 0, 0);
        if (ret)
                return ret;