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

From: Stephen Rothwell <hidden>
Date: 2011-10-04 07:11:25
Also in: lkml
Subsystem: atheros ath generic utilities, atheros ath6kl wireless driver, the rest · Maintainers: Jeff Johnson, Linus Torvalds

Hi Paul,

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

drivers/net/wireless/ath/ath6kl/cfg80211.c:25:26: error: expected ')' before 'uint'

Caused by commit 6bbc7c35ed0f ("ath6kl: Allow enabling of P2P support")
from the wireless tree interacting with the module.h split.

I added the following patch:

From: Stephen Rothwell <redacted>
Date: Tue, 4 Oct 2011 18:07:51 +1100
Subject: [PATCH] ath6kl: module_param needs the inclusion of moduleparam.h

Signed-off-by: Stephen Rothwell <redacted>
---
 drivers/net/wireless/ath/ath6kl/cfg80211.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.c b/drivers/net/wireless/ath/ath6kl/cfg80211.c
index 8d9fbd4..c201445 100644
--- a/drivers/net/wireless/ath/ath6kl/cfg80211.c
+++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c
@@ -14,6 +14,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include <linux/moduleparam.h>
+
 #include "core.h"
 #include "cfg80211.h"
 #include "debug.h"
-- 
1.7.6.3

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

Attachments

Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help