diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-09 22:43:20 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-09 22:43:20 -0500 |
| commit | 4247bfe20ab1cb8cf1874b811c0dc60bcd0249e8 (patch) | |
| tree | 4d0a598e4aa4a9efa5c4f27ca56d357575cc6660 /include/linux/regulator | |
| parent | 86caa905f333ddfb609c55c60e2679d764652181 (diff) | |
| parent | 1a8f85d402a2bf3b86c08c696a0adf36656f770a (diff) | |
Merge remote-tracking branch 'regulator/topic/stub' into regulator-next
Diffstat (limited to 'include/linux/regulator')
| -rw-r--r-- | include/linux/regulator/consumer.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/regulator/consumer.h b/include/linux/regulator/consumer.h index 5d0f7c10bef1..8bb7eba4ec45 100644 --- a/include/linux/regulator/consumer.h +++ b/include/linux/regulator/consumer.h | |||
| @@ -359,6 +359,10 @@ static inline void regulator_set_drvdata(struct regulator *regulator, | |||
| 359 | { | 359 | { |
| 360 | } | 360 | } |
| 361 | 361 | ||
| 362 | static inline int regulator_count_voltages(struct regulator *regulator) | ||
| 363 | { | ||
| 364 | return 0; | ||
| 365 | } | ||
| 362 | #endif | 366 | #endif |
| 363 | 367 | ||
| 364 | static inline int regulator_set_voltage_tol(struct regulator *regulator, | 368 | static inline int regulator_set_voltage_tol(struct regulator *regulator, |