[PATCH] ath6kl: force building as a module

[PATCH] ath6kl: force building as a module

[Kalle Valo]

Stephen reported that ath6kl fails if both sdio and usb are built
into the kernel:

ath6kl/cfg80211.c:27:1: error: expected ')' before 'KBUILD_MODNAME'
ath6kl/cfg80211.c:27:1: error: 'KBUILD_MODNAME' undeclared here (not in a function)
ath6kl/cfg80211.c:27:1: error: expected ',' or ';' before string constant

As a temporary fix make ath6kl build only as a module. This will be reverted
once a separate ath6kl core module is implemented which will fix this
properly.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
---
 drivers/net/wireless/ath/ath6kl/Kconfig |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/net/wireless/ath/ath6kl/Kconfig b/drivers/net/wireless/ath/ath6kl/Kconfig
index d755a5e..d290ec7 100644
--- a/drivers/net/wireless/ath/ath6kl/Kconfig
+++ b/drivers/net/wireless/ath/ath6kl/Kconfig
@@ -6,6 +6,7 @@ config ATH6KL_SDIO
 	depends on ATH6KL
 	depends on MMC
 	depends on CFG80211
+	depends on m
 	---help---
 	  This module adds support for wireless adapters based on
 	  Atheros AR6003 and AR6004 chipsets running over SDIO. If you
@@ -19,6 +20,7 @@ config ATH6KL_USB
 	depends on USB
 	depends on CFG80211
 	depends on EXPERIMENTAL
+	depends on m
 	---help---
 	  This module adds support for wireless adapters based on
 	  Atheros AR6004 chipset running over USB. This is still under

Re: [PATCH] ath6kl: force building as a module

[Kalle Valo]

On 01/04/2012 11:41 AM, Kalle Valo wrote:
> Stephen reported that ath6kl fails if both sdio and usb are built
> into the kernel:
> 
> ath6kl/cfg80211.c:27:1: error: expected ')' before 'KBUILD_MODNAME'
> ath6kl/cfg80211.c:27:1: error: 'KBUILD_MODNAME' undeclared here (not in a function)
> ath6kl/cfg80211.c:27:1: error: expected ',' or ';' before string constant
> 
> As a temporary fix make ath6kl build only as a module. This will be reverted
> once a separate ath6kl core module is implemented which will fix this
> properly.
> 
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

Sorry, forgot to CC people. The original patch is here:

http://marc.info/?l=linux-wireless&m=132567025132302&w=2

John, can you please take this directly so that the build problem gets
fixed quickly? I will also apply it to ath6kl.git but that should not
create any merge problems.

Kalle

Re: [PATCH] ath6kl: force building as a module

[David Miller]

From: Kalle Valo <kvalo@qca.qualcomm.com>
Date: Wed, 04 Jan 2012 11:41:34 +0200

> Stephen reported that ath6kl fails if both sdio and usb are built
> into the kernel:
> 
> ath6kl/cfg80211.c:27:1: error: expected ')' before 'KBUILD_MODNAME'
> ath6kl/cfg80211.c:27:1: error: 'KBUILD_MODNAME' undeclared here (not in a function)
> ath6kl/cfg80211.c:27:1: error: expected ',' or ';' before string constant
> 
> As a temporary fix make ath6kl build only as a module. This will be reverted
> once a separate ath6kl core module is implemented which will fix this
> properly.
> 
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

NACK, fix this properly.

Re: [PATCH] ath6kl: force building as a module

[David Miller]

From: Kalle Valo <kvalo@qca.qualcomm.com>
Date: Wed, 4 Jan 2012 11:48:40 +0200

> On 01/04/2012 11:41 AM, Kalle Valo wrote:
>> Stephen reported that ath6kl fails if both sdio and usb are built
>> into the kernel:
>> 
>> ath6kl/cfg80211.c:27:1: error: expected ')' before 'KBUILD_MODNAME'
>> ath6kl/cfg80211.c:27:1: error: 'KBUILD_MODNAME' undeclared here (not in a function)
>> ath6kl/cfg80211.c:27:1: error: expected ',' or ';' before string constant
>> 
>> As a temporary fix make ath6kl build only as a module. This will be reverted
>> once a separate ath6kl core module is implemented which will fix this
>> properly.
>> 
>> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
>> Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
> 
> Sorry, forgot to CC people. The original patch is here:
> 
> http://marc.info/?l=linux-wireless&m=132567025132302&w=2
> 
> John, can you please take this directly so that the build problem gets
> fixed quickly? I will also apply it to ath6kl.git but that should not
> create any merge problems.

John can you very much NOT include this change, and if the ath6kl maintainers
can't fix this properly then revert the changes that caused this regression
in the first place?