On 10/04/2011 10:03 AM, Stephen Rothwell wrote:
> After merging the moduleh tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/net/wireless/ath/ath6kl/debug.c:237:11: error: 'THIS_MODULE' undeclared here (not in a function)
>
> Caused by commit 9a7308341b71 ("ath6kl: silence "invalid rate" warning")
> from the wireless tree interacting with the module.h split.
>
> I added this patch:
John&Paul, how do we handle this patch?
> From: Stephen Rothwell <[email protected]>
> Date: Tue, 4 Oct 2011 18:01:03 +1100
> Subject: [PATCH] ath6kl: THIS_MODULES needs export.h
>
> Signed-off-by: Stephen Rothwell <[email protected]>
> ---
> drivers/net/wireless/ath/ath6kl/debug.c | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/ath6kl/debug.c b/drivers/net/wireless/ath/ath6kl/debug.c
> index ba3f23d..7879b53 100644
> --- a/drivers/net/wireless/ath/ath6kl/debug.c
> +++ b/drivers/net/wireless/ath/ath6kl/debug.c
> @@ -19,6 +19,7 @@
> #include <linux/circ_buf.h>
> #include <linux/fs.h>
> #include <linux/vmalloc.h>
> +#include <linux/export.h>
>
> #include "debug.h"
> #include "target.h"
Kalle
On 10/04/2011 03:14 AM, Stephen Rothwell wrote:
>
> Since it adds an include of export.h (which only exists in Paul's tree),
> it goes into Paul's post merge patch series.
Sounds good. ACKed-by: Larry Finger <[email protected]>
Hi Kalle,
On Tue, 4 Oct 2011 10:35:29 +0300 Kalle Valo <[email protected]> wrote:
>
> On 10/04/2011 10:03 AM, Stephen Rothwell wrote:
> > After merging the moduleh tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> >
> > drivers/net/wireless/ath/ath6kl/debug.c:237:11: error: 'THIS_MODULE' undeclared here (not in a function)
> >
> > Caused by commit 9a7308341b71 ("ath6kl: silence "invalid rate" warning")
> > from the wireless tree interacting with the module.h split.
> >
> > I added this patch:
>
> John&Paul, how do we handle this patch?
Since it adds an include of export.h (which only exists in Paul's tree),
it goes into Paul's post merge patch series.
--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/