Merge tag 'for_3.7-rc5-fixes-pm' of git://git.kernel.org/pub/scm/linu…

…x/kernel/git/khilman/linux-omap-pm into omap-for-v3.7-rc4/fixes
git-mirror · Nov 6, 2012 · 55f4851 · 55f4851
2 parents 3d70f8c + 73c503c
commit 55f4851
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/arch/arm/mach-omap2/twl-common.c b/arch/arm/mach-omap2/twl-common.c
@@ -366,7 +366,7 @@ static struct regulator_init_data omap4_clk32kg_idata = {
 };
 
 static struct regulator_consumer_supply omap4_vdd1_supply[] = {
-	REGULATOR_SUPPLY("vcc", "mpu.0"),
+	REGULATOR_SUPPLY("vcc", "cpu0"),
 };
 
 static struct regulator_consumer_supply omap4_vdd2_supply[] = {

diff --git a/arch/arm/mach-omap2/vc.c b/arch/arm/mach-omap2/vc.c
@@ -264,7 +264,7 @@ static void __init omap_vc_i2c_init(struct voltagedomain *voltdm)
 
 	if (initialized) {
 		if (voltdm->pmic->i2c_high_speed != i2c_high_speed)
-			pr_warn("%s: I2C config for vdd_%s does not match other channels (%u).",
+			pr_warn("%s: I2C config for vdd_%s does not match other channels (%u).\n",
 				__func__, voltdm->name, i2c_high_speed);
 		return;
 	}