From: Tony Lindgren Date: Sat, 4 Apr 2009 00:25:27 +0000 (-0700) Subject: Merge branch 'omap-pool' X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=e75343a207ef24490176abe3503743d7a006e299;hp=823de921c923cc753a6746183e9c513a3452dec7;p=linux-2.6-omap-h63xx.git Merge branch 'omap-pool' --- diff --git a/arch/arm/mach-omap2/mmc-twl4030.c b/arch/arm/mach-omap2/mmc-twl4030.c index cb56fe270ab..46d6e9bcadf 100644 --- a/arch/arm/mach-omap2/mmc-twl4030.c +++ b/arch/arm/mach-omap2/mmc-twl4030.c @@ -136,14 +136,11 @@ static int twl_mmc_late_init(struct device *dev) * (which is safe for MMC, but not in general). */ if (regulator_is_enabled(hsmmc[i].vcc) > 0) { - dev_warn(dev, "APPLY REGULATOR HACK for vmmc\n"); regulator_enable(hsmmc[i].vcc); regulator_disable(hsmmc[i].vcc); } if (hsmmc[i].vcc_aux) { if (regulator_is_enabled(reg) > 0) { - dev_warn(dev, "APPLY REGULATOR HACK " - "for vmmc_aux\n"); regulator_enable(reg); regulator_disable(reg); }