Merge git://git.denx.de/u-boot-fsl-qoriq

[oweals/u-boot.git] / board / samsung / goni / goni.c

diff --git a/board/samsung/goni/goni.c b/board/samsung/goni/goni.c
index 35ed398df698476be923abebf367cfbd08bd7c07..debc4c57ffa068c14b3f2f2b7047942895b10f63 100644 (file)
--- a/board/samsung/goni/goni.c
+++ b/board/samsung/goni/goni.c
@@ -17,6 +17,7 @@
 #include <samsung/misc.h>
 #include <usb.h>
 #include <usb_mass_storage.h>
+#include <asm/mach-types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -72,7 +73,7 @@ int checkboard(void)
 }
 #endif
 
-#ifdef CONFIG_GENERIC_MMC
+#ifdef CONFIG_MMC
 int board_mmc_init(bd_t *bis)
 {
        int i, ret, ret_sd = 0;
@@ -101,7 +102,7 @@ int board_mmc_init(bd_t *bis)
 
        ret = s5p_mmc_init(0, 4);
        if (ret)
-               error("MMC: Failed to init MMC:0.\n");
+               pr_err("MMC: Failed to init MMC:0.\n");
 
        /*
         * SD card (T_FLASH) detect and init
@@ -126,7 +127,7 @@ int board_mmc_init(bd_t *bis)
 
                ret_sd = s5p_mmc_init(2, 4);
                if (ret_sd)
-                       error("MMC: Failed to init SD card (MMC:2).\n");
+                       pr_err("MMC: Failed to init SD card (MMC:2).\n");
        }
 
        return ret & ret_sd;