diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-01 08:50:14 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-01 08:50:14 -0400 |
| commit | 3aba952706c2f1e5f05987be0cda716ecf2b5d55 (patch) | |
| tree | 5a8295facd8e624b0598c67830e06c808e95a7b6 /drivers/regulator/lp8755.c | |
| parent | 882e3dba4c486a4953ccf380faf2a9751c45c018 (diff) | |
| parent | 56a942e9315877b8a9a3d2482d4c3b0da840d713 (diff) | |
Merge remote-tracking branch 'regulator/topic/lp8755' into regulator-next
Diffstat (limited to 'drivers/regulator/lp8755.c')
| -rw-r--r-- | drivers/regulator/lp8755.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/regulator/lp8755.c b/drivers/regulator/lp8755.c index d9e38b4c2adc..b37ef303e29f 100644 --- a/drivers/regulator/lp8755.c +++ b/drivers/regulator/lp8755.c | |||
| @@ -228,6 +228,7 @@ err_i2c: | |||
| 228 | } | 228 | } |
| 229 | 229 | ||
| 230 | static struct regulator_ops lp8755_buck_ops = { | 230 | static struct regulator_ops lp8755_buck_ops = { |
| 231 | .map_voltage = regulator_map_voltage_linear, | ||
| 231 | .list_voltage = regulator_list_voltage_linear, | 232 | .list_voltage = regulator_list_voltage_linear, |
| 232 | .set_voltage_sel = regulator_set_voltage_sel_regmap, | 233 | .set_voltage_sel = regulator_set_voltage_sel_regmap, |
| 233 | .get_voltage_sel = regulator_get_voltage_sel_regmap, | 234 | .get_voltage_sel = regulator_get_voltage_sel_regmap, |