Merge branch 'fix/88pm800' of...

Merge branch 'fix/88pm800' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-88pm800

Conflicts:
	drivers/regulator/88pm800.c

parents fa26e4d2 322dfa64

drivers/regulator/88pm800.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -133,7 +133,7 @@ struct pm800_regulators {
		.owner = THIS_MODULE, \
		.n_voltages = ARRAY_SIZE(ldo_volt_table), \
		.vsel_reg = PM800_##vreg##_VOUT, \
		.vsel_mask = 0x1f, \
		.vsel_mask = 0xf, \
		.enable_reg = PM800_##ereg, \
		.enable_mask = 1 << (ebit), \
		.volt_table = ldo_volt_table, \