diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-10 12:43:20 +0900 | 
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-10 12:43:20 +0900 | 
| commit | 4247bfe20ab1cb8cf1874b811c0dc60bcd0249e8 (patch) | |
| tree | 4d0a598e4aa4a9efa5c4f27ca56d357575cc6660 | |
| parent | 86caa905f333ddfb609c55c60e2679d764652181 (diff) | |
| parent | 1a8f85d402a2bf3b86c08c696a0adf36656f770a (diff) | |
| download | olio-linux-3.10-4247bfe20ab1cb8cf1874b811c0dc60bcd0249e8.tar.xz olio-linux-3.10-4247bfe20ab1cb8cf1874b811c0dc60bcd0249e8.zip  | |
Merge remote-tracking branch 'regulator/topic/stub' into regulator-next
| -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 5d0f7c10bef..8bb7eba4ec4 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,  {  } +static inline int regulator_count_voltages(struct regulator *regulator) +{ +	return 0; +}  #endif  static inline int regulator_set_voltage_tol(struct regulator *regulator,  |