Merge remote-tracking branch 'regulator/fix/s2mpa01' into regulator-linus

This commit is contained in:
Mark Brown 2014-06-02 17:07:59 +01:00
commit 277b1be9d4

View File

@ -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;