lkml.org 
[lkml]   [2011]   [Jul]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patches in this message
/
Date
From
SubjectRe: linux-next: build failure after merge of the moduleh tree
Hi Paul,

On Sun, 31 Jul 2011 03:44:55 -0400 Paul Gortmaker <paul.gortmaker@windriver.com> wrote:
>
> [linux-next: build failure after merge of the moduleh tree] On 29/07/2011 (Fri 17:06) Stephen Rothwell wrote:
>
> > After merging the moduleh tree, today's linux-next build (powerpc
> > allyesconfig) failed like this:
> >
> > drivers/power/max8997_charger.c:205:1: warning: type defaults to 'int' in declaration of 'MODULE_AUTHOR'

This driver is upstream today. Randy wrote a patch for it (which I will
apply to my fixes tree today):

Date: Fri, 29 Jul 2011 21:11:43 -0700
From: Randy Dunlap <rdunlap@xenotime.net>
Subject: [PATCH -next] power: max8998_charger.c needs module.h

power/max8998_charger.c uses interfaces from linux/module.h,
so it should include that file. This fixes build errors.

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
---
drivers/power/max8998_charger.c | 1 +
1 file changed, 1 insertion(+)
--- linux-next-20110729.orig/drivers/power/max8998_charger.c
+++ linux-next-20110729/drivers/power/max8998_charger.c
@@ -20,6 +20,7 @@
*/

#include <linux/err.h>
+#include <linux/module.h>
#include <linux/slab.h>
#include <linux/platform_device.h>
#include <linux/power_supply.h>

> [...]
> > drivers/regulator/aat2870-regulator.c:231:1: warning: type defaults to 'int' in declaration of 'MODULE_LICENSE'
> [...]
>
> The mmc ones I can fix; the power/regulator ones are not in master yet.
> But since they need module.h, the fix can be applied by their respective
> tree owner as well (vs. ones needing export.h -- which presents a minor
> chicken-and-egg problem).

OK, Randy wrote a fix patch for drivers/regulator/aat2870-regulator.c as
well (which he cc'd to the wrong people :-(). I have it reproduced below
and it should be applied to the mfd tree. I will apply it myself for
today.

Date: Fri, 29 Jul 2011 12:43:13 -0700
From: Randy Dunlap <rdunlap@xenotime.net>
Subject: [PATCH -next] regulator: aat2870 needs module.h

aat2870-regulator.c needs to include linux/module.h to fix multiple
build errors.

drivers/regulator/aat2870-regulator.c:145: error: 'THIS_MODULE' undeclared here (not in a function)
drivers/regulator/aat2870-regulator.c:230: warning: type defaults to 'int' in declaration of 'MODULE_DESCRIPTION'
drivers/regulator/aat2870-regulator.c:231: warning: type defaults to 'int' in declaration of 'MODULE_LICENSE'
drivers/regulator/aat2870-regulator.c:232: warning: type defaults to 'int' in declaration of 'MODULE_AUTHOR'

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
---
drivers/regulator/aat2870-regulator.c | 1 +
1 file changed, 1 insertion(+)
--- linux-next-20110729.orig/drivers/regulator/aat2870-regulator.c
+++ linux-next-20110729/drivers/regulator/aat2870-regulator.c
@@ -22,6 +22,7 @@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/err.h>
+#include <linux/module.h>
#include <linux/slab.h>
#include <linux/delay.h>
#include <linux/platform_device.h>

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


\
 
 \ /
  Last update: 2011-08-01 02:33    [from the cache]
©2003-2011 Jasper Spaans