diff options
| author | Mark Brown <broonie@linaro.org> | 2014-06-16 11:05:56 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-06-16 11:05:56 -0400 |
| commit | c3313b0ce8e70d6c5e556664090c6ab311cb892a (patch) | |
| tree | 0c2dce1e8d6912cc302aa305bb8df91f6bdeb087 /include/linux/regulator/consumer.h | |
| parent | 7171511eaec5bf23fb06078f59784a3a0626b38f (diff) | |
| parent | b14903e10a06347234b387f7364f86aa07252d9f (diff) | |
Merge remote-tracking branch 'regulator/fix/core' into regulator-linus
Diffstat (limited to 'include/linux/regulator/consumer.h')
| -rw-r--r-- | include/linux/regulator/consumer.h | 5 |
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, | |||
| 395 | { | 395 | { |
| 396 | } | 396 | } |
| 397 | 397 | ||
| 398 | static inline int regulator_can_change_voltage(struct regulator *regulator) | ||
| 399 | { | ||
| 400 | return 0; | ||
| 401 | } | ||
| 402 | |||
| 398 | static inline int regulator_set_voltage(struct regulator *regulator, | 403 | static inline int regulator_set_voltage(struct regulator *regulator, |
| 399 | int min_uV, int max_uV) | 404 | int min_uV, int max_uV) |
| 400 | { | 405 | { |