summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-06-16 19:05:56 +0400
committerMark Brown <broonie@linaro.org>2014-06-16 19:05:56 +0400
commitc3313b0ce8e70d6c5e556664090c6ab311cb892a (patch)
tree0c2dce1e8d6912cc302aa305bb8df91f6bdeb087 /include/linux
parent7171511eaec5bf23fb06078f59784a3a0626b38f (diff)
parentb14903e10a06347234b387f7364f86aa07252d9f (diff)
downloadlinux-c3313b0ce8e70d6c5e556664090c6ab311cb892a.tar.xz
Merge remote-tracking branch 'regulator/fix/core' into regulator-linus
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/regulator/consumer.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/regulator/consumer.h b/include/linux/regulator/consumer.h
index a2d9d81038d1..14ec18d5e18b 100644
--- a/include/linux/regulator/consumer.h
+++ b/include/linux/regulator/consumer.h
@@ -395,6 +395,11 @@ static inline void regulator_bulk_free(int num_consumers,
{
}
+static inline int regulator_can_change_voltage(struct regulator *regulator)
+{
+ return 0;
+}
+
static inline int regulator_set_voltage(struct regulator *regulator,
int min_uV, int max_uV)
{