diff options
| author | Axel Lin <axel.lin@gmail.com> | 2012-01-26 23:55:28 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-01-27 05:33:59 -0500 |
| commit | e24abd6ec6c2dabccb825dc41d1725bc496b3a54 (patch) | |
| tree | a30a4d352a505c59e130b4433e4f4042f6115112 /include/linux/regulator | |
| parent | e6e740304aa2a49ef09497e6c0bb906ed7987f6b (diff) | |
regulator: Add empty devm_regulator_bulk_get for !CONFIG_REGULATOR
This fixes below build error if CONFIG_REGULATOR is disabled.
CC sound/soc/codecs/wm5100.o
sound/soc/codecs/wm5100.c: In function ‘wm5100_i2c_probe’:
sound/soc/codecs/wm5100.c:2462: error: implicit declaration of function ‘devm_regulator_bulk_get’
make[3]: *** [sound/soc/codecs/wm5100.o] Error 1
make[2]: *** [sound/soc/codecs] Error 2
make[1]: *** [sound/soc] Error 2
make: *** [sound] Error 2
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'include/linux/regulator')
| -rw-r--r-- | include/linux/regulator/consumer.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/regulator/consumer.h b/include/linux/regulator/consumer.h index 35c42834ba3d..cef8f04efc34 100644 --- a/include/linux/regulator/consumer.h +++ b/include/linux/regulator/consumer.h | |||
| @@ -249,6 +249,12 @@ static inline int regulator_bulk_get(struct device *dev, | |||
| 249 | return 0; | 249 | return 0; |
| 250 | } | 250 | } |
| 251 | 251 | ||
| 252 | static inline int devm_regulator_bulk_get(struct device *dev, int num_consumers, | ||
| 253 | struct regulator_bulk_data *consumers) | ||
| 254 | { | ||
| 255 | return 0; | ||
| 256 | } | ||
| 257 | |||
| 252 | static inline int regulator_bulk_enable(int num_consumers, | 258 | static inline int regulator_bulk_enable(int num_consumers, |
| 253 | struct regulator_bulk_data *consumers) | 259 | struct regulator_bulk_data *consumers) |
| 254 | { | 260 | { |
