Patchworkβ [-next] staging/wireless: don't build when NET etc. are not enabled

login
register
about
Submitter Randy Dunlap
Date 2009-11-06 23:35:15
Message ID <4AF4B2B3.8020109@oracle.com>
Download mbox | patch
Permalink /patch/58203/
State New
Headers show

Comments

Randy Dunlap - 2009-11-06 23:35:15
From: Randy Dunlap <randy.dunlap@oracle.com>

These wireless drivers in staging could be built when
CONFIG_NET=n, CONFIG_NETDEVICES=n, causing this build error:

net/wireless/wext-priv.c: In function 'ioctl_private_call':
net/wireless/wext-priv.c:206: error: implicit declaration of function 'call_commit_handler'

due to faulty selects.

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
---
 drivers/staging/arlan/Kconfig   |    2 +-
 drivers/staging/netwave/Kconfig |    2 +-
 drivers/staging/wavelan/Kconfig |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/
John Linville - 2009-11-07 23:32:05
I'd better take this one...

Thanks, Randy!

John

On Fri, Nov 06, 2009 at 03:35:15PM -0800, Randy Dunlap wrote:
> From: Randy Dunlap <randy.dunlap@oracle.com>
> 
> These wireless drivers in staging could be built when
> CONFIG_NET=n, CONFIG_NETDEVICES=n, causing this build error:
> 
> net/wireless/wext-priv.c: In function 'ioctl_private_call':
> net/wireless/wext-priv.c:206: error: implicit declaration of function 'call_commit_handler'
> 
> due to faulty selects.
> 
> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
> Cc: Greg Kroah-Hartman <gregkh@suse.de>
> ---
>  drivers/staging/arlan/Kconfig   |    2 +-
>  drivers/staging/netwave/Kconfig |    2 +-
>  drivers/staging/wavelan/Kconfig |    4 ++--
>  3 files changed, 4 insertions(+), 4 deletions(-)
> 
> --- linux-next-20091106.orig/drivers/staging/arlan/Kconfig
> +++ linux-next-20091106/drivers/staging/arlan/Kconfig
> @@ -1,6 +1,6 @@
>  config ARLAN
>  	tristate "Aironet Arlan 655 & IC2200 DS support"
> -	depends on ISA && !64BIT
> +	depends on ISA && !64BIT && WLAN
>  	select WIRELESS_EXT
>  	---help---
>  	  Aironet makes Arlan, a class of wireless LAN adapters. These use the
> --- linux-next-20091106.orig/drivers/staging/netwave/Kconfig
> +++ linux-next-20091106/drivers/staging/netwave/Kconfig
> @@ -1,6 +1,6 @@
>  config PCMCIA_NETWAVE
>  	tristate "Xircom Netwave AirSurfer Pcmcia wireless support"
> -	depends on PCMCIA
> +	depends on PCMCIA && WLAN
>  	select WIRELESS_EXT
>  	select WEXT_PRIV
>  	help
> --- linux-next-20091106.orig/drivers/staging/wavelan/Kconfig
> +++ linux-next-20091106/drivers/staging/wavelan/Kconfig
> @@ -1,6 +1,6 @@
>  config WAVELAN
>  	tristate "AT&T/Lucent old WaveLAN & DEC RoamAbout DS ISA support"
> -	depends on ISA
> +	depends on ISA && WLAN
>  	select WIRELESS_EXT
>  	select WEXT_SPY
>  	select WEXT_PRIV
> @@ -25,7 +25,7 @@ config WAVELAN
>  
>  config PCMCIA_WAVELAN
>  	tristate "AT&T/Lucent old WaveLAN Pcmcia wireless support"
> -	depends on PCMCIA
> +	depends on PCMCIA && WLAN
>  	select WIRELESS_EXT
>  	select WEXT_SPY
>  	select WEXT_PRIV
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
>

Patch

--- linux-next-20091106.orig/drivers/staging/arlan/Kconfig
+++ linux-next-20091106/drivers/staging/arlan/Kconfig
@@ -1,6 +1,6 @@ 
 config ARLAN
 	tristate "Aironet Arlan 655 & IC2200 DS support"
-	depends on ISA && !64BIT
+	depends on ISA && !64BIT && WLAN
 	select WIRELESS_EXT
 	---help---
 	  Aironet makes Arlan, a class of wireless LAN adapters. These use the
--- linux-next-20091106.orig/drivers/staging/netwave/Kconfig
+++ linux-next-20091106/drivers/staging/netwave/Kconfig
@@ -1,6 +1,6 @@ 
 config PCMCIA_NETWAVE
 	tristate "Xircom Netwave AirSurfer Pcmcia wireless support"
-	depends on PCMCIA
+	depends on PCMCIA && WLAN
 	select WIRELESS_EXT
 	select WEXT_PRIV
 	help
--- linux-next-20091106.orig/drivers/staging/wavelan/Kconfig
+++ linux-next-20091106/drivers/staging/wavelan/Kconfig
@@ -1,6 +1,6 @@ 
 config WAVELAN
 	tristate "AT&T/Lucent old WaveLAN & DEC RoamAbout DS ISA support"
-	depends on ISA
+	depends on ISA && WLAN
 	select WIRELESS_EXT
 	select WEXT_SPY
 	select WEXT_PRIV
@@ -25,7 +25,7 @@  config WAVELAN
 
 config PCMCIA_WAVELAN
 	tristate "AT&T/Lucent old WaveLAN Pcmcia wireless support"
-	depends on PCMCIA
+	depends on PCMCIA && WLAN
 	select WIRELESS_EXT
 	select WEXT_SPY
 	select WEXT_PRIV