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

[platform/kernel/u-boot.git] / board / ti / beagle / beagle.c

diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c
index c1365e2..887b577 100644 (file)
--- a/board/ti/beagle/beagle.c
+++ b/board/ti/beagle/beagle.c
@@ -443,13 +443,13 @@ int misc_init_r(void)
                printf("Recognized BeagleBoardToys WiFi board\n");
                MUX_BBTOYS_WIFI()
                setenv("buddy", "bbtoys-wifi");
-               break;;
+               break;
        case BBTOYS_VGA:
                printf("Recognized BeagleBoardToys VGA board\n");
-               break;;
+               break;
        case BBTOYS_LCD:
                printf("Recognized BeagleBoardToys LCD board\n");
-               break;;
+               break;
        case BCT_BRETTL3:
                printf("Recognized bct electronic GmbH brettl3 board\n");
                break;
@@ -524,14 +524,14 @@ void set_muxconf_regs(void)
        MUX_BEAGLE();
 }
 
-#if defined(CONFIG_GENERIC_MMC)
+#if defined(CONFIG_MMC)
 int board_mmc_init(bd_t *bis)
 {
        return omap_mmc_init(0, 0, 0, -1, -1);
 }
 #endif
 
-#if defined(CONFIG_GENERIC_MMC)
+#if defined(CONFIG_MMC)
 void board_mmc_power_init(void)
 {
        twl4030_power_mmc_init(0);