X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=net%2Fieee80211%2FKconfig;h=dbb08528ddf5ef3f974ad06f2950552e55c762a6;hb=4a232e725b5cc1bc7fc5b177424a9ff8313b23ad;hp=58ed4319e6930167664bce8e7e5c15cddda301b7;hpb=e766f1cc596078b1603ac2c96617660c4c7e2d81;p=linux-2.6

diff --git a/net/ieee80211/Kconfig b/net/ieee80211/Kconfig
index 58ed4319e6..dbb08528dd 100644
--- a/net/ieee80211/Kconfig
+++ b/net/ieee80211/Kconfig
@@ -1,6 +1,5 @@
 config IEEE80211
 	tristate "Generic IEEE 802.11 Networking Stack"
-	select NET_RADIO
 	---help---
 	This option enables the hardware independent IEEE 802.11
 	networking stack.
@@ -56,7 +55,7 @@ config IEEE80211_CRYPT_CCMP
 
 config IEEE80211_CRYPT_TKIP
 	tristate "IEEE 802.11i TKIP encryption"
-	depends on IEEE80211
+	depends on IEEE80211 && NET_RADIO
 	select CRYPTO
 	select CRYPTO_MICHAEL_MIC
 	---help---
@@ -67,3 +66,4 @@ config IEEE80211_CRYPT_TKIP
 	This can be compiled as a modules and it will be called
 	"ieee80211_crypt_tkip".
 
+source "net/ieee80211/softmac/Kconfig"