summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-09-01 16:50:14 +0400
committerMark Brown <broonie@linaro.org>2013-09-01 16:50:14 +0400
commit3aba952706c2f1e5f05987be0cda716ecf2b5d55 (patch)
tree5a8295facd8e624b0598c67830e06c808e95a7b6
parent882e3dba4c486a4953ccf380faf2a9751c45c018 (diff)
parent56a942e9315877b8a9a3d2482d4c3b0da840d713 (diff)
downloadlinux-3aba952706c2f1e5f05987be0cda716ecf2b5d55.tar.xz
Merge remote-tracking branch 'regulator/topic/lp8755' into regulator-next
-rw-r--r--drivers/regulator/lp8755.c1
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:
}
static struct regulator_ops lp8755_buck_ops = {
+ .map_voltage = regulator_map_voltage_linear,
.list_voltage = regulator_list_voltage_linear,
.set_voltage_sel = regulator_set_voltage_sel_regmap,
.get_voltage_sel = regulator_get_voltage_sel_regmap,