diff options
author | Ingo Molnar <mingo@kernel.org> | 2015-07-31 09:59:28 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-07-31 09:59:28 +0200 |
commit | acd632eb64b6cd8e25583bb248c36aa937b8f021 (patch) | |
tree | 993d276cbadb450fe8cf5e3c66d444a905d452e7 /drivers/regulator/88pm800.c | |
parent | Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
parent | Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
download | linux-acd632eb64b6cd8e25583bb248c36aa937b8f021.tar.xz linux-acd632eb64b6cd8e25583bb248c36aa937b8f021.zip |
Merge branch 'perf/urgent' into perf/core, to merge fixes before pulling more changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/regulator/88pm800.c')
-rw-r--r-- | drivers/regulator/88pm800.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/88pm800.c b/drivers/regulator/88pm800.c index 832932bdc977..7fd4f511d78f 100644 --- a/drivers/regulator/88pm800.c +++ b/drivers/regulator/88pm800.c @@ -130,7 +130,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, \ |