| Message ID | 20110928183552.cb27a2b28b02fec275bca009@canb.auug.org.au |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | David Miller |
| Headers | show |
On 09/28/2011 11:35 AM, Stephen Rothwell wrote: > Hi Paul, > > After merging the moduleh tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > drivers/net/wireless/ath/ath6kl/init.c:27:26: error: expected ')' before 'uint' > > Caused by commit bdcd81707973 ("Add ath6kl cleaned up driver") from the > net tree interacting with the module.h split up. > > I have applied the following patch for today (which sould be applied to > the net or wireless trees). > > From 1875bfc8881cca3064c7d7fad024555fe1652926 Mon Sep 17 00:00:00 2001 > From: Stephen Rothwell <sfr@canb.auug.org.au> > Date: Wed, 28 Sep 2011 18:32:34 +1000 > Subject: [PATCH] wireless/ath6kl: use of module_param requires the inclusion > of moduleparam.h > > Otheriwse the module.h split up fails like this: > > drivers/net/wireless/ath/ath6kl/init.c:27:26: error: expected ')' before 'uint' Thanks, I applied this to ath6kl.git (had to fix just one conflict). Later this week I will send a pull request to John so that the patch should get to the wireless tree soon. Unless John wants to take the patch directly, of course. Kalle -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/wireless/ath/ath6kl/init.c b/drivers/net/wireless/ath/ath6kl/init.c index 9d10322..8552da0 100644 --- a/drivers/net/wireless/ath/ath6kl/init.c +++ b/drivers/net/wireless/ath/ath6kl/init.c @@ -15,6 +15,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include <linux/moduleparam.h> #include <linux/mmc/sdio_func.h> #include "core.h" #include "cfg80211.h"
Hi Paul, After merging the moduleh tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/net/wireless/ath/ath6kl/init.c:27:26: error: expected ')' before 'uint' Caused by commit bdcd81707973 ("Add ath6kl cleaned up driver") from the net tree interacting with the module.h split up. I have applied the following patch for today (which sould be applied to the net or wireless trees). From 1875bfc8881cca3064c7d7fad024555fe1652926 Mon Sep 17 00:00:00 2001 From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Wed, 28 Sep 2011 18:32:34 +1000 Subject: [PATCH] wireless/ath6kl: use of module_param requires the inclusion of moduleparam.h Otheriwse the module.h split up fails like this: drivers/net/wireless/ath/ath6kl/init.c:27:26: error: expected ')' before 'uint' Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> --- drivers/net/wireless/ath/ath6kl/init.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)