Misc clean-up for upstream merges

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap2 / mmc-twl4030.c

diff --git a/arch/arm/mach-omap2/mmc-twl4030.c b/arch/arm/mach-omap2/mmc-twl4030.c
index 626d66867172bc907468b9b2ae0786a6a8d6b7c3..437f52073f6ef3f6d4ad93f36c417315fb0ded7e 100644 (file)
--- a/arch/arm/mach-omap2/mmc-twl4030.c
+++ b/arch/arm/mach-omap2/mmc-twl4030.c
@@ -25,7 +25,8 @@
 
 #include "mmc-twl4030.h"
 
-#if defined(CONFIG_MMC_OMAP_HS) || defined(CONFIG_MMC_OMAP_HS_MODULE)
+#if defined(CONFIG_TWL4030_CORE) && \
+       (defined(CONFIG_MMC_OMAP_HS) || defined(CONFIG_MMC_OMAP_HS_MODULE))
 
 #define LDO_CLR                        0x00
 #define VSEL_S2_CLR            0x40
@@ -315,7 +316,7 @@ static int twl_mmc2_set_power(struct device *dev, int slot, int power_on, int vd
 
 static struct omap_mmc_platform_data *hsmmc_data[OMAP34XX_NR_MMC] __initdata;
 
-void __init hsmmc_init(struct twl4030_hsmmc_info *controllers)
+void __init twl4030_mmc_init(struct twl4030_hsmmc_info *controllers)
 {
        struct twl4030_hsmmc_info *c;
        int nr_hsmmc = ARRAY_SIZE(hsmmc_data);