summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-12-10 12:42:52 +0900
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-12-10 12:42:52 +0900
commit6234427eb8b3c4cd329bcb68773d1e5389b3f83b (patch)
treee4f6f0b2cd75527702ca044802240fb66be0f85e /include
parentb0e5997ef4300da08b051d2a84ce6cc11b267042 (diff)
parentd1e7de3007c6e34c5e6d5e1b707b5aba4a1cd57f (diff)
Merge remote-tracking branch 'regulator/topic/change' into regulator-next
Diffstat (limited to 'include')
-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 c43cd3556b1..5d0f7c10bef 100644
--- a/include/linux/regulator/consumer.h
+++ b/include/linux/regulator/consumer.h
@@ -160,6 +160,7 @@ int regulator_bulk_force_disable(int num_consumers,
void regulator_bulk_free(int num_consumers,
struct regulator_bulk_data *consumers);
+int regulator_can_change_voltage(struct regulator *regulator);
int regulator_count_voltages(struct regulator *regulator);
int regulator_list_voltage(struct regulator *regulator, unsigned selector);
int regulator_is_supported_voltage(struct regulator *regulator,