diff options
author | Mark Brown <broonie@sirena.org.uk> | 2013-04-27 21:13:36 -0400 |
---|---|---|
committer | Mark Brown <broonie@sirena.org.uk> | 2013-04-27 21:13:36 -0400 |
commit | 97844ede9487fc7c4689ce1499bbaa10312618be (patch) | |
tree | f65b9136b96ecc47b71fe43aacf93ba149ece508 /include/linux/regulator | |
parent | 83b0dd9ea30bae84913907dfba452233ea3cc898 (diff) | |
parent | b92f567deb51d2ee312e02e59f60021778e657ae (diff) |
Merge remote-tracking branch 'regulator/topic/ascend' into v3.9-rc8
Diffstat (limited to 'include/linux/regulator')
-rw-r--r-- | include/linux/regulator/driver.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h index 7df93f52db08..2acdc66f8342 100644 --- a/include/linux/regulator/driver.h +++ b/include/linux/regulator/driver.h | |||
@@ -329,6 +329,8 @@ int regulator_map_voltage_linear(struct regulator_dev *rdev, | |||
329 | int min_uV, int max_uV); | 329 | int min_uV, int max_uV); |
330 | int regulator_map_voltage_iterate(struct regulator_dev *rdev, | 330 | int regulator_map_voltage_iterate(struct regulator_dev *rdev, |
331 | int min_uV, int max_uV); | 331 | int min_uV, int max_uV); |
332 | int regulator_map_voltage_ascend(struct regulator_dev *rdev, | ||
333 | int min_uV, int max_uV); | ||
332 | int regulator_get_voltage_sel_regmap(struct regulator_dev *rdev); | 334 | int regulator_get_voltage_sel_regmap(struct regulator_dev *rdev); |
333 | int regulator_set_voltage_sel_regmap(struct regulator_dev *rdev, unsigned sel); | 335 | int regulator_set_voltage_sel_regmap(struct regulator_dev *rdev, unsigned sel); |
334 | int regulator_is_enabled_regmap(struct regulator_dev *rdev); | 336 | int regulator_is_enabled_regmap(struct regulator_dev *rdev); |