Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for...

[linux-2.6-omap-h63xx.git] / net / ieee80211 / Kconfig

diff --git a/net/ieee80211/Kconfig b/net/ieee80211/Kconfig
index d18ccba3ea9e7f2dcb9f6b1708c4bf86094b0145..f7e84e9d13ad347d7e56a5d9db76b4d70744d8c7 100644 (file)
--- a/net/ieee80211/Kconfig
+++ b/net/ieee80211/Kconfig
@@ -58,6 +58,7 @@ config IEEE80211_CRYPT_TKIP
        depends on IEEE80211 && NET_RADIO
        select CRYPTO
        select CRYPTO_MICHAEL_MIC
+       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 +67,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"