Merge remote-tracking branch 'regulator/topic/stub' into regulator-next

4247bfe2 · Mark Brown · 86caa905 · 1a8f85d4 · 4247bfe2
Commit 4247bfe2 authored Dec 10, 2012 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

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

No files found.
--- 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,
 {
 }
+static inline int regulator_count_voltages(struct regulator *regulator)
+{
+	return 0;
+}
 #endif
 static inline int regulator_set_voltage_tol(struct regulator *regulator,