Hi Kalle,

On Tue, 4 Oct 2011 10:35:29 +0300 Kalle Valo <kvalo@qca.qualcomm.com> 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                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/