evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Conflicts:
	drivers/regulator/88pm800.c
This commit is contained in:
Mark Brown 2015-07-17 12:42:48 +01:00
commit bf1fc23c80
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/regulator/88pm800.c
View file

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