summaryrefslogtreecommitdiff
path: root/drivers/regulator/tps6524x-regulator.c
diff options
context:
space:
mode:
authorMark Brown <broonie@sirena.org.uk>2013-04-28 02:13:36 +0100
committerMark Brown <broonie@sirena.org.uk>2013-04-28 02:13:36 +0100
commit97844ede9487fc7c4689ce1499bbaa10312618be (patch)
treef65b9136b96ecc47b71fe43aacf93ba149ece508 /drivers/regulator/tps6524x-regulator.c
parent83b0dd9ea30bae84913907dfba452233ea3cc898 (diff)
parentb92f567deb51d2ee312e02e59f60021778e657ae (diff)
downloadlwn-97844ede9487fc7c4689ce1499bbaa10312618be.tar.gz
lwn-97844ede9487fc7c4689ce1499bbaa10312618be.zip
Merge remote-tracking branch 'regulator/topic/ascend' into v3.9-rc8
Diffstat (limited to 'drivers/regulator/tps6524x-regulator.c')
-rw-r--r--drivers/regulator/tps6524x-regulator.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/regulator/tps6524x-regulator.c b/drivers/regulator/tps6524x-regulator.c
index 843ee0a9bb92..18b67d28d60b 100644
--- a/drivers/regulator/tps6524x-regulator.c
+++ b/drivers/regulator/tps6524x-regulator.c
@@ -572,6 +572,7 @@ static struct regulator_ops regulator_ops = {
.get_voltage_sel = get_voltage_sel,
.set_voltage_sel = set_voltage_sel,
.list_voltage = regulator_list_voltage_table,
+ .map_voltage = regulator_map_voltage_ascend,
.set_current_limit = set_current_limit,
.get_current_limit = get_current_limit,
};