* [PATCH] regulator: Add empty devm_regulator_bulk_get for !CONFIG_REGULATOR
@ 2012-01-27 4:55 Axel Lin
2012-01-27 10:34 ` Mark Brown
0 siblings, 1 reply; 2+ messages in thread
From: Axel Lin @ 2012-01-27 4:55 UTC (permalink / raw)
To: linux-kernel; +Cc: Liam Girdwood, Mark Brown
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>
---
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] regulator: Add empty devm_regulator_bulk_get for !CONFIG_REGULATOR
2012-01-27 4:55 [PATCH] regulator: Add empty devm_regulator_bulk_get for !CONFIG_REGULATOR Axel Lin
@ 2012-01-27 10:34 ` Mark Brown
0 siblings, 0 replies; 2+ messages in thread
From: Mark Brown @ 2012-01-27 10:34 UTC (permalink / raw)
To: Axel Lin; +Cc: linux-kernel, Liam Girdwood
On Fri, Jan 27, 2012 at 12:55:28PM +0800, Axel Lin wrote:
> This fixes below build error if CONFIG_REGULATOR is disabled.
Weird, I somehow managed to avoid checking that in to the commit though
it's in my tree. Anyway, applied - thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-01-27 10:34 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-01-27 4:55 [PATCH] regulator: Add empty devm_regulator_bulk_get for !CONFIG_REGULATOR Axel Lin
2012-01-27 10:34 ` Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).