diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-06 11:28:51 +0000 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-06 11:28:51 +0000 |
commit | 918d623b04ad80482542477f6dfa0bd47eca3771 (patch) | |
tree | 56e6669680acfe416a73fea08cc2dccc15e1bc5a /drivers/regulator | |
parent | 44784cb32bc3d697e3ce90906ed9ef8a3ec2ca4b (diff) | |
parent | c76edd52bf19c9d01da7edc4ff04d3707c299779 (diff) | |
download | linux-3.10-918d623b04ad80482542477f6dfa0bd47eca3771.tar.gz linux-3.10-918d623b04ad80482542477f6dfa0bd47eca3771.tar.bz2 linux-3.10-918d623b04ad80482542477f6dfa0bd47eca3771.zip |
Merge remote-tracking branch 'regulator/fix/s2mps11' into tmp
Diffstat (limited to 'drivers/regulator')
-rw-r--r-- | drivers/regulator/s2mps11.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/regulator/s2mps11.c b/drivers/regulator/s2mps11.c index bd062a2ffbe..cd9ea2ea182 100644 --- a/drivers/regulator/s2mps11.c +++ b/drivers/regulator/s2mps11.c @@ -174,9 +174,9 @@ static struct regulator_ops s2mps11_buck_ops = { .min_uV = S2MPS11_BUCK_MIN2, \ .uV_step = S2MPS11_BUCK_STEP2, \ .n_voltages = S2MPS11_BUCK_N_VOLTAGES, \ - .vsel_reg = S2MPS11_REG_B9CTRL2, \ + .vsel_reg = S2MPS11_REG_B10CTRL2, \ .vsel_mask = S2MPS11_BUCK_VSEL_MASK, \ - .enable_reg = S2MPS11_REG_B9CTRL1, \ + .enable_reg = S2MPS11_REG_B10CTRL1, \ .enable_mask = S2MPS11_ENABLE_MASK \ } |