Hi Paul,
[I reported this on Friday, but this time I have a patch.]
After merging the moduleh tree, today's linux-next build (powerpc
allyesconfig) failed like this:
drivers/power/max8997_charger.c:185:12: error: 'THIS_MODULE' undeclared here (not in a function)
drivers/power/max8997_charger.c:204:20: error: expected declaration specifiers or '...' before string constant
drivers/power/max8997_charger.c:204:1: warning: data definition has no type or storage class
drivers/power/max8997_charger.c:204:1: warning: type defaults to 'int' in declaration of 'MODULE_DESCRIPTION'
drivers/power/max8997_charger.c:204:20: warning: function declaration isn't a prototype
drivers/power/max8997_charger.c:205:15: error: expected declaration specifiers or '...' before string constant
drivers/power/max8997_charger.c:205:1: warning: data definition has no type or storage class
drivers/power/max8997_charger.c:205:1: warning: type defaults to 'int' in declaration of 'MODULE_AUTHOR'
drivers/power/max8997_charger.c:205:15: warning: function declaration isn't a prototype
drivers/power/max8997_charger.c:206:16: error: expected declaration specifiers or '...' before string constant
drivers/power/max8997_charger.c:206:1: warning: data definition has no type or storage class
drivers/power/max8997_charger.c:206:1: warning: type defaults to 'int' in declaration of 'MODULE_LICENSE'
drivers/power/max8997_charger.c:206:16: warning: function declaration isn't a prototype
Caused by commit 149c077b4bd7 ("power_supply: Add charger driver for
MAX8997/8966") interacting with the modules.h split.
I have applied the following patch for today. This file is now upstream,
so this patch could be applied to Linus' tree (or the battery tree where
this commit originated).
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Mon, 1 Aug 2011 13:51:35 +1000
Subject: [PATCH] power_supply: max8997_charger.c need to include module.h
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
drivers/power/max8997_charger.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/power/max8997_charger.c b/drivers/power/max8997_charger.c
index 7106b49..b093af9 100644
--- a/drivers/power/max8997_charger.c
+++ b/drivers/power/max8997_charger.c
@@ -23,6 +23,7 @@
#include <linux/slab.h>
#include <linux/platform_device.h>
#include <linux/power_supply.h>
+#include <linux/module.h>
#include <linux/mfd/max8997.h>
#include <linux/mfd/max8997-private.h>
--
1.7.5.4
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
