Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55f4851a authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge tag 'for_3.7-rc5-fixes-pm' of... 

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
parents 3d70f8c6 73c503cb

arch/arm/mach-omap2/twl-common.c

+1 −1
Original line number Diff line number Diff line
@@ -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[] = {

arch/arm/mach-omap2/vc.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

	}