lkml.org 
[lkml]   [2011]   [Sep]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subjectlinux-next: build failure after merge of the final tree (moduleh tree related)
Hi all,

After merging the final tree, today's linux-next build (powerpc
allyesconfig) failed like this:

drivers/staging/cxt1e1/linux.c:113:32: error: expected ')' before 'int'
drivers/staging/cxt1e1/linux.c:117:30: error: expected ')' before 'int'
drivers/staging/cxt1e1/linux.c:121:30: error: expected ')' before 'int'
drivers/staging/cxt1e1/linux.c:125:31: error: expected ')' before 'int'
drivers/staging/cxt1e1/linux.c:129:31: error: expected ')' before 'int'

Caused by the module split. The fix in the moduleh tree (commit
6eee8b750254 ("staging: Add module.h to more drivers implicitly using
i")) is incorrect in that module.h has been included too late.

I have applied the following patch for today.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 29 Sep 2011 16:36:21 +1000
Subject: [PATCH] staging: move the module.h include in cxt1e1/linux.c

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/staging/cxt1e1/linux.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/staging/cxt1e1/linux.c b/drivers/staging/cxt1e1/linux.c
index e7029af..6e574fe 100644
--- a/drivers/staging/cxt1e1/linux.c
+++ b/drivers/staging/cxt1e1/linux.c
@@ -15,6 +15,7 @@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

#include <linux/types.h>
+#include <linux/module.h>
#include <linux/netdevice.h>
#include <linux/hdlc.h>
#include <linux/if_arp.h>
@@ -163,7 +164,6 @@ mkret (int bsd)

/***************************************************************************/
#include <linux/workqueue.h>
-#include <linux/module.h>

/***
* One workqueue (wq) per port (since musycc allows simultaneous group
--
1.7.6.3
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/


\
 
 \ /
  Last update: 2011-09-29 08:43    [W:0.055 / U:1.356 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site