summaryrefslogtreecommitdiffstats
path: root/include/linux/regulator
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-07-01 11:17:08 +0100
committerMark Brown <broonie@linaro.org>2013-07-01 11:17:08 +0100
commit0a192cc8600bede44a0425402758631d410a7c6f (patch)
tree7aeb844ebe2002ba6e05482f674e0c989be9061e /include/linux/regulator
parent39c9f80f43d754dadb2cd1adbc365840b5e99cca (diff)
parent2a668a8bc2cbe7a464ab1212475a3efb23a94b1e (diff)
downloadop-kernel-dev-0a192cc8600bede44a0425402758631d410a7c6f.zip
op-kernel-dev-0a192cc8600bede44a0425402758631d410a7c6f.tar.gz
Merge remote-tracking branch 'regulator/topic/linar' into regulator-next
Diffstat (limited to 'include/linux/regulator')
-rw-r--r--include/linux/regulator/consumer.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/regulator/consumer.h b/include/linux/regulator/consumer.h
index 145022a..3a76389 100644
--- a/include/linux/regulator/consumer.h
+++ b/include/linux/regulator/consumer.h
@@ -165,6 +165,7 @@ int regulator_count_voltages(struct regulator *regulator);
int regulator_list_voltage(struct regulator *regulator, unsigned selector);
int regulator_is_supported_voltage(struct regulator *regulator,
int min_uV, int max_uV);
+unsigned int regulator_get_linear_step(struct regulator *regulator);
int regulator_set_voltage(struct regulator *regulator, int min_uV, int max_uV);
int regulator_set_voltage_time(struct regulator *regulator,
int old_uV, int new_uV);
OpenPOWER on IntegriCloud