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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]


Hi Paul,

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

drivers/net/wireless/rtlwifi/debug.c:32:21: error: expected ')' before 'uint'
drivers/net/wireless/rtlwifi/debug.c:33:25: error: expected ')' before string constant

Caused by commit b5be7e4c8f7b ("rtlwifi: add module parameter to set
global debug level") from the net tree interacting with the module.h
split up.

I have applied the following patch for today (and it could be applied to
the net or wireless trees).

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Wed, 28 Sep 2011 18:21:47 +1000
Subject: [PATCH] rtlwifi: use of module_param requires the inclusion of
 moduleparam.h

Otherwise the module.h split up will fail like this:

drivers/net/wireless/rtlwifi/debug.c:32:21: error: expected ')' before 'uint'
drivers/net/wireless/rtlwifi/debug.c:33:25: error: expected ')' before string constant

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 drivers/net/wireless/rtlwifi/debug.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/net/wireless/rtlwifi/debug.c b/drivers/net/wireless/rtlwifi/debug.c
index b2f897a..e69aba9 100644
--- a/drivers/net/wireless/rtlwifi/debug.c
+++ b/drivers/net/wireless/rtlwifi/debug.c
@@ -26,6 +26,8 @@
  * Larry Finger <Larry.Finger@xxxxxxxxxxxx>
  *****************************************************************************/
 
+#include <linux/moduleparam.h>
+
 #include "wifi.h"
 
 static unsigned int debug = DBG_EMERG;
-- 
1.7.6.3

-- 
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


[Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Photo]     [Yosemite News]    [Yosemite Photos]    [Free Online Dating]     [Linux Kernel]     [Linux SCSI]     [XFree86]

Add to Google Powered by Linux