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

git-mirror · Dec 10, 2012 · 4247bfe · 4247bfe
2 parents 86caa90 + 1a8f85d
commit 4247bfe
Showing 1 changed file with 4 additions and 0 deletions.
diff --git 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,