[PATCH] regulator: Add empty devm_regulator_bulk_get for!CONFIG_REGULATOR

From: Axel Lin
Date: Thu Jan 26 2012 - 23:55:44 EST


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@xxxxxxxxx>
---
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 35c4283..cef8f04 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,
return 0;
}

+static inline int devm_regulator_bulk_get(struct device *dev, int num_consumers,
+ struct regulator_bulk_data *consumers)
+{
+ return 0;
+}
+
static inline int regulator_bulk_enable(int num_consumers,
struct regulator_bulk_data *consumers)
{
--
1.7.5.4



--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/