diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-11-06 09:53:42 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-11-06 09:53:42 -0800 |
| commit | 55f4851a0b141faac119f04212e2911fd968812a (patch) | |
| tree | 7eb1c8c4198fc1c74565519b794098cdf13664cd | |
| parent | 3d70f8c617a436c7146ecb81df2265b4626dfe89 (diff) | |
| parent | 73c503cb981394872db41dd5cde385cb5373b4b9 (diff) | |
| download | linux-3.10-55f4851a0b141faac119f04212e2911fd968812a.tar.gz linux-3.10-55f4851a0b141faac119f04212e2911fd968812a.tar.bz2 linux-3.10-55f4851a0b141faac119f04212e2911fd968812a.zip | |
Merge tag 'for_3.7-rc5-fixes-pm' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-v3.7-rc4/fixes
| -rw-r--r-- | arch/arm/mach-omap2/twl-common.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/vc.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/twl-common.c b/arch/arm/mach-omap2/twl-common.c index 635e109f5ad..44c42057b61 100644 --- 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 index 880249b1701..75878c37959 100644 --- 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; } |