linux-next: build failure after merge of the moduleh tree

From: Stephen Rothwell
Date: Tue Oct 11 2011 - 04:25:38 EST


Hi Paul,

After merging the moduleh tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/regulator/gpio-regulator.c: In function 'gpio_regulator_probe':
drivers/regulator/gpio-regulator.c:209:24: error: 'THIS_MODULE' undeclared (first use in this function)
drivers/regulator/gpio-regulator.c:209:24: note: each undeclared identifier is reported only once for each function it appears in
drivers/regulator/gpio-regulator.c: At top level:
drivers/regulator/gpio-regulator.c:338:13: error: 'THIS_MODULE' undeclared here (not in a function)
drivers/regulator/gpio-regulator.c:354:15: error: expected declaration specifiers or '...' before string constant
drivers/regulator/gpio-regulator.c:355:20: error: expected declaration specifiers or '...' before string constant
drivers/regulator/gpio-regulator.c:356:16: error: expected declaration specifiers or '...' before string constant
drivers/regulator/gpio-regulator.c:357:14: error: expected declaration specifiers or '...' before string constant

Caused by commit 3f0292ae8bb1 ("regulator: Add driver for gpio-controlled
regulators") from the regulator tree interacting with the module.h split
up.

I have applied the following patch for today. Mark, Liam, this should be
applied to the regulator tree.

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Tue, 11 Oct 2011 19:22:29 +1100
Subject: [PATCH] regulator: using module related services requires module.h

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
drivers/regulator/gpio-regulator.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/regulator/gpio-regulator.c b/drivers/regulator/gpio-regulator.c
index abf32ad..24d4477 100644
--- a/drivers/regulator/gpio-regulator.c
+++ b/drivers/regulator/gpio-regulator.c
@@ -31,6 +31,7 @@
#include <linux/gpio.h>
#include <linux/delay.h>
#include <linux/slab.h>
+#include <linux/module.h>

struct gpio_regulator_data {
struct regulator_desc desc;
--
1.7.6.3

--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature