Merge remote-tracking branch 'regulator/fix/s2mpa01' into regulator-l…

…inus
git-mirror · Jun 2, 2014 · 277b1be · 277b1be
2 parents fad01e8 + 112da5c
commit 277b1be
Showing 1 changed file with 0 additions and 1 deletion.
diff --git 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;