diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-19 12:42:33 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-19 12:42:33 +0000 |
| commit | eb230d4a6120673938dddd1e4fbbf3ff6def2976 (patch) | |
| tree | e3e6e7bf0c3ef552913d4f8ff54e6f2fc1902e8b /drivers | |
| parent | 52582adcb9c45b0d7b6decfb39325c303f06d8e0 (diff) | |
| parent | 5551a6a0eb1b329f85da58cfdf204a89efaa25a9 (diff) | |
| download | linux-eb230d4a6120673938dddd1e4fbbf3ff6def2976.tar.bz2 | |
Merge remote-tracking branch 'regulator/topic/da9055' into regulator-next
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/regulator/da9055-regulator.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/regulator/da9055-regulator.c b/drivers/regulator/da9055-regulator.c index 1a05ac66878f..30221099d09c 100644 --- a/drivers/regulator/da9055-regulator.c +++ b/drivers/regulator/da9055-regulator.c @@ -58,7 +58,6 @@ struct da9055_volt_reg { int reg_b; int sl_shift; int v_mask; - int v_shift; }; struct da9055_mode_reg { @@ -388,7 +387,6 @@ static struct regulator_ops da9055_ldo_ops = { .reg_b = DA9055_REG_VBCORE_B + DA9055_ID_##_id, \ .sl_shift = 7,\ .v_mask = (1 << (vbits)) - 1,\ - .v_shift = (vbits),\ },\ } @@ -417,7 +415,6 @@ static struct regulator_ops da9055_ldo_ops = { .reg_b = DA9055_REG_VBCORE_B + DA9055_ID_##_id, \ .sl_shift = 7,\ .v_mask = (1 << (vbits)) - 1,\ - .v_shift = (vbits),\ },\ .mode = {\ .reg = DA9055_REG_BCORE_MODE,\ |