Merge branch 'linux-2.6' into for-linus

[cascardo/linux.git] / net / ieee80211 / Kconfig

diff --git a/net/ieee80211/Kconfig b/net/ieee80211/Kconfig
index d18ccba..a64be6c 100644 (file)
--- a/net/ieee80211/Kconfig
+++ b/net/ieee80211/Kconfig
@@ -32,6 +32,7 @@ config IEEE80211_CRYPT_WEP
        depends on IEEE80211
        select CRYPTO
        select CRYPTO_ARC4
+       select CRYPTO_ECB
        select CRC32
        ---help---
        Include software based cipher suites in support of IEEE
@@ -58,6 +59,8 @@ config IEEE80211_CRYPT_TKIP
        depends on IEEE80211 && NET_RADIO
        select CRYPTO
        select CRYPTO_MICHAEL_MIC
+       select CRYPTO_ECB
+       select CRC32
        ---help---
        Include software based cipher suites in support of IEEE 802.11i
        (aka TGi, WPA, WPA2, WPA-PSK, etc.) for use with TKIP enabled
@@ -66,3 +69,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"