diff options
author | Mark Brown <broonie@sirena.org.uk> | 2013-04-28 02:13:36 +0100 |
---|---|---|
committer | Mark Brown <broonie@sirena.org.uk> | 2013-04-28 02:13:36 +0100 |
commit | 97844ede9487fc7c4689ce1499bbaa10312618be (patch) | |
tree | f65b9136b96ecc47b71fe43aacf93ba149ece508 /drivers/regulator/mc13892-regulator.c | |
parent | 83b0dd9ea30bae84913907dfba452233ea3cc898 (diff) | |
parent | b92f567deb51d2ee312e02e59f60021778e657ae (diff) | |
download | linux-97844ede9487fc7c4689ce1499bbaa10312618be.tar.gz linux-97844ede9487fc7c4689ce1499bbaa10312618be.tar.xz |
Merge remote-tracking branch 'regulator/topic/ascend' into v3.9-rc8
Diffstat (limited to 'drivers/regulator/mc13892-regulator.c')
-rw-r--r-- | drivers/regulator/mc13892-regulator.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/regulator/mc13892-regulator.c b/drivers/regulator/mc13892-regulator.c index b8d35ec598ea..b716283a8760 100644 --- a/drivers/regulator/mc13892-regulator.c +++ b/drivers/regulator/mc13892-regulator.c @@ -485,6 +485,7 @@ static int mc13892_sw_regulator_set_voltage_sel(struct regulator_dev *rdev, static struct regulator_ops mc13892_sw_regulator_ops = { .list_voltage = regulator_list_voltage_table, + .map_voltage = regulator_map_voltage_ascend, .set_voltage_sel = mc13892_sw_regulator_set_voltage_sel, .get_voltage_sel = mc13892_sw_regulator_get_voltage_sel, }; |