Hi Paul, After merging the moduleh tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/net/wireless/brcm80211/brcmutil/utils.c:20:15: error: expected declaration specifiers or '...' before string constant drivers/net/wireless/brcm80211/brcmutil/utils.c:21:20: error: expected declaration specifiers or '...' before string constant drivers/net/wireless/brcm80211/brcmutil/utils.c:22:25: error: expected declaration specifiers or '...' before string constant drivers/net/wireless/brcm80211/brcmutil/utils.c:23:16: error: expected declaration specifiers or '...' before string constant drivers/net/wireless/brcm80211/brcmutil/utils.c:37:1: warning: data definition has no type or storage class [enabled by default] drivers/net/wireless/brcm80211/brcmutil/utils.c:37:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL' [-Wimplicit-int] drivers/net/wireless/brcm80211/brcmutil/utils.c:37:1: warning: parameter names (without types) in function declaration [enabled by default] drivers/net/wireless/brcm80211/brcmutil/utils.c:65:1: warning: data definition has no type or storage class [enabled by default] drivers/net/wireless/brcm80211/brcmutil/utils.c:65:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL' [-Wimplicit-int] drivers/net/wireless/brcm80211/brcmutil/utils.c:65:1: warning: parameter names (without types) in function declaration [enabled by default] drivers/net/wireless/brcm80211/brcmutil/utils.c:96:1: warning: data definition has no type or storage class [enabled by default] drivers/net/wireless/brcm80211/brcmutil/utils.c:96:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL' [-Wimplicit-int] drivers/net/wireless/brcm80211/brcmutil/utils.c:96:1: warning: parameter names (without types) in function declaration [enabled by default] drivers/net/wireless/brcm80211/brcmutil/utils.c:108:1: warning: data definition has no type or storage class [enabled by default] drivers/net/wireless/brcm80211/brcmutil/utils.c:108:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL' [-Wimplicit-int] drivers/net/wireless/brcm80211/brcmutil/utils.c:108:1: warning: parameter names (without types) in function declaration [enabled by default] drivers/net/wireless/brcm80211/brcmutil/utils.c:139:1: warning: data definition has no type or storage class [enabled by default] drivers/net/wireless/brcm80211/brcmutil/utils.c:139:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL' [-Wimplicit-int] drivers/net/wireless/brcm80211/brcmutil/utils.c:139:1: warning: parameter names (without types) in function declaration [enabled by default] drivers/net/wireless/brcm80211/brcmutil/utils.c:165:1: warning: data definition has no type or storage class [enabled by default] drivers/net/wireless/brcm80211/brcmutil/utils.c:165:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL' [-Wimplicit-int] drivers/net/wireless/brcm80211/brcmutil/utils.c:165:1: warning: parameter names (without types) in function declaration [enabled by default] drivers/net/wireless/brcm80211/brcmutil/utils.c:190:1: warning: data definition has no type or storage class [enabled by default] drivers/net/wireless/brcm80211/brcmutil/utils.c:190:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL' [-Wimplicit-int] drivers/net/wireless/brcm80211/brcmutil/utils.c:190:1: warning: parameter names (without types) in function declaration [enabled by default] drivers/net/wireless/brcm80211/brcmutil/utils.c:218:1: warning: data definition has no type or storage class [enabled by default] drivers/net/wireless/brcm80211/brcmutil/utils.c:218:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL' [-Wimplicit-int] drivers/net/wireless/brcm80211/brcmutil/utils.c:218:1: warning: parameter names (without types) in function declaration [enabled by default] drivers/net/wireless/brcm80211/brcmutil/utils.c:250:1: warning: data definition has no type or storage class [enabled by default] drivers/net/wireless/brcm80211/brcmutil/utils.c:250:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL' [-Wimplicit-int] drivers/net/wireless/brcm80211/brcmutil/utils.c:250:1: warning: parameter names (without types) in function declaration [enabled by default] drivers/net/wireless/brcm80211/brcmutil/utils.c:259:1: warning: data definition has no type or storage class [enabled by default] drivers/net/wireless/brcm80211/brcmutil/utils.c:259:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL' [-Wimplicit-int] drivers/net/wireless/brcm80211/brcmutil/utils.c:259:1: warning: parameter names (without types) in function declaration [enabled by default] drivers/net/wireless/brcm80211/brcmutil/utils.c:276:1: warning: data definition has no type or storage class [enabled by default] drivers/net/wireless/brcm80211/brcmutil/utils.c:276:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL' [-Wimplicit-int] drivers/net/wireless/brcm80211/brcmutil/utils.c:276:1: warning: parameter names (without types) in function declaration [enabled by default] drivers/net/wireless/brcm80211/brcmutil/utils.c:294:1: warning: data definition has no type or storage class [enabled by default] drivers/net/wireless/brcm80211/brcmutil/utils.c:294:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL' [-Wimplicit-int] drivers/net/wireless/brcm80211/brcmutil/utils.c:294:1: warning: parameter names (without types) in function declaration [enabled by default] drivers/net/wireless/brcm80211/brcmutil/utils.c:309:1: warning: data definition has no type or storage class [enabled by default] drivers/net/wireless/brcm80211/brcmutil/utils.c:309:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL' [-Wimplicit-int] drivers/net/wireless/brcm80211/brcmutil/utils.c:309:1: warning: parameter names (without types) in function declaration [enabled by default] drivers/net/wireless/brcm80211/brcmutil/utils.c:350:1: warning: data definition has no type or storage class [enabled by default] drivers/net/wireless/brcm80211/brcmutil/utils.c:350:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL' [-Wimplicit-int] drivers/net/wireless/brcm80211/brcmutil/utils.c:350:1: warning: parameter names (without types) in function declaration [enabled by default] drivers/net/wireless/brcm80211/brcmutil/utils.c:364:1: warning: data definition has no type or storage class [enabled by default] drivers/net/wireless/brcm80211/brcmutil/utils.c:364:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL' [-Wimplicit-int] drivers/net/wireless/brcm80211/brcmutil/utils.c:364:1: warning: parameter names (without types) in function declaration [enabled by default] drivers/net/wireless/brcm80211/brcmutil/utils.c:394:1: warning: data definition has no type or storage class [enabled by default] drivers/net/wireless/brcm80211/brcmutil/utils.c:394:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL' [-Wimplicit-int] drivers/net/wireless/brcm80211/brcmutil/utils.c:394:1: warning: parameter names (without types) in function declaration [enabled by default] drivers/net/wireless/brcm80211/brcmutil/utils.c:451:1: warning: data definition has no type or storage class [enabled by default] drivers/net/wireless/brcm80211/brcmutil/utils.c:451:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL' [-Wimplicit-int] drivers/net/wireless/brcm80211/brcmutil/utils.c:451:1: warning: parameter names (without types) in function declaration [enabled by default] drivers/net/wireless/brcm80211/brcmutil/utils.c:469:1: warning: data definition has no type or storage class [enabled by default] drivers/net/wireless/brcm80211/brcmutil/utils.c:469:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL' [-Wimplicit-int] drivers/net/wireless/brcm80211/brcmutil/utils.c:469:1: warning: parameter names (without types) in function declaration [enabled by default] drivers/net/wireless/brcm80211/brcmutil/utils.c:480:1: warning: data definition has no type or storage class [enabled by default] drivers/net/wireless/brcm80211/brcmutil/utils.c:480:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL' [-Wimplicit-int] drivers/net/wireless/brcm80211/brcmutil/utils.c:480:1: warning: parameter names (without types) in function declaration [enabled by default] drivers/net/wireless/brcm80211/brcmutil/utils.c:499:1: warning: data definition has no type or storage class [enabled by default] drivers/net/wireless/brcm80211/brcmutil/utils.c:499:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL' [-Wimplicit-int] drivers/net/wireless/brcm80211/brcmutil/utils.c:499:1: warning: parameter names (without types) in function declaration [enabled by default] drivers/net/wireless/brcm80211/brcmutil/utils.c:553:1: warning: data definition has no type or storage class [enabled by default] drivers/net/wireless/brcm80211/brcmutil/utils.c:553:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL' [-Wimplicit-int] drivers/net/wireless/brcm80211/brcmutil/utils.c:553:1: warning: parameter names (without types) in function declaration [enabled by default] drivers/net/wireless/brcm80211/brcmutil/utils.c:585:1: warning: data definition has no type or storage class [enabled by default] drivers/net/wireless/brcm80211/brcmutil/utils.c:585:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL' [-Wimplicit-int] drivers/net/wireless/brcm80211/brcmutil/utils.c:585:1: warning: parameter names (without types) in function declaration [enabled by default] drivers/net/wireless/brcm80211/brcmutil/utils.c:600:1: warning: data definition has no type or storage class [enabled by default] drivers/net/wireless/brcm80211/brcmutil/utils.c:600:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL' [-Wimplicit-int] drivers/net/wireless/brcm80211/brcmutil/utils.c:600:1: warning: parameter names (without types) in function declaration [enabled by default] drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c:47:15: error: expected declaration specifiers or '...' before string constant drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c:48:20: error: expected declaration specifiers or '...' before string constant drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c:49:25: error: expected declaration specifiers or '...' before string constant drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c:50:16: error: expected declaration specifiers or '...' before string constant drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c:80:31: error: expected ')' before 'int' drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c:3400:17: error: expected declaration specifiers or '...' before string constant drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c:3401:17: error: expected declaration specifiers or '...' before string constant drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c:51:1: warning: data definition has no type or storage class [enabled by default] drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c:51:1: warning: type defaults to 'int' in declaration of 'MODULE_DEVICE_TABLE' [-Wimplicit-int] drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c:51:1: warning: parameter names (without types) in function declaration [enabled by default] Caused by commit 5b435de0d786 ("net: wireless: add brcm80211 drivers") from the wireless tree interacting with the module.h split up. These files clearly should include module.h (John, please apply this to the wireless tree): From d89b14ffc84a2b8a54ffe89453b8bbf9cabf1468 Mon Sep 17 00:00:00 2001 From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Date: Wed, 12 Oct 2011 17:07:06 +1100 Subject: [PATCH] net: wireless: brcm80211: include module.h Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> --- diff --git a/drivers/net/wireless/brcm80211/brcmutil/utils.c b/drivers/net/wireless/brcm80211/brcmutil/utils.c index 62bcc71..e96bdbf 100644 --- a/drivers/net/wireless/brcm80211/brcmutil/utils.c +++ b/drivers/net/wireless/brcm80211/brcmutil/utils.c @@ -15,6 +15,7 @@ */ #include <linux/netdevice.h> +#include <linux/module.h> #include <brcmu_utils.h> MODULE_AUTHOR("Broadcom Corporation"); diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c index e919de2..bbaeb2d 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c @@ -23,6 +23,7 @@ #include <linux/suspend.h> #include <linux/errno.h> #include <linux/sched.h> /* request_irq() */ +#include <linux/module.h> #include <net/cfg80211.h> #include <defs.h> diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c index 03607ca..1adc3be 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c @@ -31,6 +31,7 @@ #include <linux/hardirq.h> #include <linux/mutex.h> #include <linux/wait.h> +#include <linux/module.h> #include <net/cfg80211.h> #include <net/rtnetlink.h> #include <defs.h> diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c index 6885755..bd9db48 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c @@ -27,6 +27,7 @@ #include <linux/mmc/card.h> #include <linux/semaphore.h> #include <linux/firmware.h> +#include <linux/module.h> #include <asm/unaligned.h> #include <defs.h> #include <brcmu_wifi.h> -- 1.7.6.3 -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgp55QesEBGv7.pgp
Description: PGP signature