summaryrefslogtreecommitdiff
path: root/drivers/regulator
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-06-02 17:07:59 +0100
committerMark Brown <broonie@linaro.org>2014-06-02 17:07:59 +0100
commit277b1be9d4c5b6f8e33d4445142ca39bafb05c2e (patch)
tree0ece792c5f8ede1e0b69a02dad5eb0731f45985d /drivers/regulator
parentfad01e866afdbe01a1f3ec06a39c3a8b9e197014 (diff)
parent112da5cb43427b843e49b8710f53ecdbb3471d9f (diff)
Merge remote-tracking branch 'regulator/fix/s2mpa01' into regulator-linus
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/s2mpa01.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/regulator/s2mpa01.c b/drivers/regulator/s2mpa01.c
index f19a30f0fb42..a52cb1cec576 100644
--- a/drivers/regulator/s2mpa01.c
+++ b/drivers/regulator/s2mpa01.c
@@ -116,7 +116,6 @@ static int s2mpa01_set_ramp_delay(struct regulator_dev *rdev, int ramp_delay)
ramp_delay = s2mpa01->ramp_delay16;
ramp_shift = S2MPA01_BUCK16_RAMP_SHIFT;
- ramp_reg = S2MPA01_REG_RAMP1;
break;
case S2MPA01_BUCK2:
enable_shift = S2MPA01_BUCK2_RAMP_EN_SHIFT;