diff --git a/[refs] b/[refs]
index bd6291612ba3..4075ffa42a89 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 309e731a619bee28ace609b0c4c3a0029b7e5394
+refs/heads/master: 6a6a5c7af130e703c23d23ebe3cde23e079e554e
diff --git a/trunk/drivers/staging/arlan/Kconfig b/trunk/drivers/staging/arlan/Kconfig
index 0585ed8b4d3e..5e42b81f97b0 100644
--- a/trunk/drivers/staging/arlan/Kconfig
+++ b/trunk/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
diff --git a/trunk/drivers/staging/netwave/Kconfig b/trunk/drivers/staging/netwave/Kconfig
index c0c996c0550a..8033e8171f9e 100644
--- a/trunk/drivers/staging/netwave/Kconfig
+++ b/trunk/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
diff --git a/trunk/drivers/staging/wavelan/Kconfig b/trunk/drivers/staging/wavelan/Kconfig
index 786060e025c0..af655668c2a7 100644
--- a/trunk/drivers/staging/wavelan/Kconfig
+++ b/trunk/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