Merge remote-tracking branch 'regulator/fix/core' into regulator-linus

c3313b0c · Mark Brown · 7171511e · b14903e1 · c3313b0c
Commit c3313b0c authored Jun 16, 2014 by Mark Brown
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

include/linux/regulator/consumer.h include/linux/regulator/consumer.h +5 -0

No files found.
--- 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)
 {