Merge branch 'upstream-fixes' into upstream

[powerpc.git] / net / ieee80211 / Kconfig

diff --git a/net/ieee80211/Kconfig b/net/ieee80211/Kconfig
index 91b16fb..dbb0852 100644 (file)
--- a/net/ieee80211/Kconfig
+++ b/net/ieee80211/Kconfig
@@ -55,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---
@@ -66,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"