From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kalle Valo Subject: Re: linux-next: build failure after merge of the moduleh tree Date: Tue, 4 Oct 2011 10:35:29 +0300 Message-ID: <4E8AB741.9030707@qca.qualcomm.com> References: <20111004180333.44f741dc08063a918c9b581f@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit Return-path: Received: from wolverine02.qualcomm.com ([199.106.114.251]:7356 "EHLO wolverine02.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754071Ab1JDHfh (ORCPT ); Tue, 4 Oct 2011 03:35:37 -0400 In-Reply-To: <20111004180333.44f741dc08063a918c9b581f@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: Paul Gortmaker , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, "John W. Linville" , linux-wireless 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 > Date: Tue, 4 Oct 2011 18:01:03 +1100 > Subject: [PATCH] ath6kl: THIS_MODULES needs export.h > > Signed-off-by: Stephen Rothwell > --- > 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 > #include > #include > +#include > > #include "debug.h" > #include "target.h" Kalle