* linux-next: build failure after merge of the final tree (moduleh/trivial trees related)
@ 2012-03-06 6:58 Stephen Rothwell
2012-03-06 14:14 ` Paul Gortmaker
2012-03-06 14:14 ` Jiri Kosina
0 siblings, 2 replies; 3+ messages in thread
From: Stephen Rothwell @ 2012-03-06 6:58 UTC (permalink / raw)
To: Paul Gortmaker, Jiri Kosina; +Cc: linux-next, linux-kernel, Jesper Juhl
[-- Attachment #1: Type: text/plain, Size: 1860 bytes --]
Hi all,
After merging the final tree, today's linux-next build (powerpc
allyesconfig) failed like this:
drivers/power/max8998_charger.c:198:12: error: 'THIS_MODULE' undeclared here (not in a function)
drivers/power/max8998_charger.c:207:20: error: expected declaration specifiers or '...' before string constant
drivers/power/max8998_charger.c:208:15: error: expected declaration specifiers or '...' before string constant
drivers/power/max8998_charger.c:209:16: error: expected declaration specifiers or '...' before string constant
drivers/power/max8998_charger.c:210:14: error: expected declaration specifiers or '...' before string constant
Caused by commit 13ae246db4a0 ("includecheck: delete any duplicate
instances of module.h") from the moduleh tree interacting with commit
ce64b8d85de9 ("power, max8998: Include linux/module.h just once in
drivers/power/max8998_charger.c") from the trivial tree.
They both removed different includes of module.h leaving none.
I have applied the following patch for today:
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Tue, 6 Mar 2012 17:56:45 +1100
Subject: [PATCH] power, max8998: we need at least one include of module.h
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
drivers/power/max8998_charger.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/power/max8998_charger.c b/drivers/power/max8998_charger.c
index d6a8c16..5c5f281 100644
--- a/drivers/power/max8998_charger.c
+++ b/drivers/power/max8998_charger.c
@@ -19,6 +19,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <linux/module.h>
#include <linux/err.h>
#include <linux/slab.h>
#include <linux/platform_device.h>
--
1.7.9.1
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: linux-next: build failure after merge of the final tree (moduleh/trivial trees related)
2012-03-06 6:58 linux-next: build failure after merge of the final tree (moduleh/trivial trees related) Stephen Rothwell
@ 2012-03-06 14:14 ` Paul Gortmaker
2012-03-06 14:14 ` Jiri Kosina
1 sibling, 0 replies; 3+ messages in thread
From: Paul Gortmaker @ 2012-03-06 14:14 UTC (permalink / raw)
To: Jiri Kosina; +Cc: Stephen Rothwell, linux-next, linux-kernel, Jesper Juhl
On 12-03-06 01:58 AM, Stephen Rothwell wrote:
> Hi all,
>
> After merging the final tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
>
> drivers/power/max8998_charger.c:198:12: error: 'THIS_MODULE' undeclared here (not in a function)
> drivers/power/max8998_charger.c:207:20: error: expected declaration specifiers or '...' before string constant
> drivers/power/max8998_charger.c:208:15: error: expected declaration specifiers or '...' before string constant
> drivers/power/max8998_charger.c:209:16: error: expected declaration specifiers or '...' before string constant
> drivers/power/max8998_charger.c:210:14: error: expected declaration specifiers or '...' before string constant
>
> Caused by commit 13ae246db4a0 ("includecheck: delete any duplicate
> instances of module.h") from the moduleh tree interacting with commit
> ce64b8d85de9 ("power, max8998: Include linux/module.h just once in
> drivers/power/max8998_charger.c") from the trivial tree.
Hi Jiri,
Since we'll still have the global dup removal commit regardless,
it probably makes sense to just drop the one in trivial. But if
that is a problem for one reason or another, let me know and I'll
fixup my commit to at least delete the same one you delete.
Thanks,
Paul.
>
> They both removed different includes of module.h leaving none.
>
> I have applied the following patch for today:
>
> From: Stephen Rothwell <sfr@canb•auug.org.au>
> Date: Tue, 6 Mar 2012 17:56:45 +1100
> Subject: [PATCH] power, max8998: we need at least one include of module.h
>
> Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
> ---
> drivers/power/max8998_charger.c | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/power/max8998_charger.c b/drivers/power/max8998_charger.c
> index d6a8c16..5c5f281 100644
> --- a/drivers/power/max8998_charger.c
> +++ b/drivers/power/max8998_charger.c
> @@ -19,6 +19,7 @@
> * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
> */
>
> +#include <linux/module.h>
> #include <linux/err.h>
> #include <linux/slab.h>
> #include <linux/platform_device.h>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: build failure after merge of the final tree (moduleh/trivial trees related)
2012-03-06 6:58 linux-next: build failure after merge of the final tree (moduleh/trivial trees related) Stephen Rothwell
2012-03-06 14:14 ` Paul Gortmaker
@ 2012-03-06 14:14 ` Jiri Kosina
1 sibling, 0 replies; 3+ messages in thread
From: Jiri Kosina @ 2012-03-06 14:14 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Paul Gortmaker, linux-next, linux-kernel, Jesper Juhl
On Tue, 6 Mar 2012, Stephen Rothwell wrote:
> Hi all,
>
> After merging the final tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
>
> drivers/power/max8998_charger.c:198:12: error: 'THIS_MODULE' undeclared here (not in a function)
> drivers/power/max8998_charger.c:207:20: error: expected declaration specifiers or '...' before string constant
> drivers/power/max8998_charger.c:208:15: error: expected declaration specifiers or '...' before string constant
> drivers/power/max8998_charger.c:209:16: error: expected declaration specifiers or '...' before string constant
> drivers/power/max8998_charger.c:210:14: error: expected declaration specifiers or '...' before string constant
>
> Caused by commit 13ae246db4a0 ("includecheck: delete any duplicate
> instances of module.h") from the moduleh tree interacting with commit
> ce64b8d85de9 ("power, max8998: Include linux/module.h just once in
> drivers/power/max8998_charger.c") from the trivial tree.
>
> They both removed different includes of module.h leaving none.
>
> I have applied the following patch for today:
>
> From: Stephen Rothwell <sfr@canb•auug.org.au>
> Date: Tue, 6 Mar 2012 17:56:45 +1100
> Subject: [PATCH] power, max8998: we need at least one include of module.h
>
> Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
> ---
> drivers/power/max8998_charger.c | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/power/max8998_charger.c b/drivers/power/max8998_charger.c
> index d6a8c16..5c5f281 100644
> --- a/drivers/power/max8998_charger.c
> +++ b/drivers/power/max8998_charger.c
> @@ -19,6 +19,7 @@
> * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
> */
>
> +#include <linux/module.h>
> #include <linux/err.h>
> #include <linux/slab.h>
> #include <linux/platform_device.h>
I have dropped the patch from my tree, thanks for the report Stephen.
--
Jiri Kosina
SUSE Labs
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-03-06 14:14 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-06 6:58 linux-next: build failure after merge of the final tree (moduleh/trivial trees related) Stephen Rothwell
2012-03-06 14:14 ` Paul Gortmaker
2012-03-06 14:14 ` Jiri Kosina
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox