Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[pandora-kernel.git] / net / ieee80211 / Kconfig

diff --git a/net/ieee80211/Kconfig b/net/ieee80211/Kconfig
index 6ef766e..94ed7d3 100644 (file)
--- a/net/ieee80211/Kconfig
+++ b/net/ieee80211/Kconfig
@@ -1,8 +1,9 @@
 config IEEE80211
-       tristate "Generic IEEE 802.11 Networking Stack"
+       tristate "Generic IEEE 802.11 Networking Stack (DEPRECATED)"
        ---help---
        This option enables the hardware independent IEEE 802.11
-       networking stack.
+       networking stack.  This component is deprecated in favor of the
+       mac80211 component.
 
 config IEEE80211_DEBUG
        bool "Enable full debugging output"
@@ -56,7 +57,8 @@ config IEEE80211_CRYPT_CCMP
 
 config IEEE80211_CRYPT_TKIP
        tristate "IEEE 802.11i TKIP encryption"
-       depends on IEEE80211 && NET_RADIO
+       depends on IEEE80211
+       select WIRELESS_EXT
        select CRYPTO
        select CRYPTO_MICHAEL_MIC
        select CRYPTO_ECB
@@ -69,4 +71,3 @@ config IEEE80211_CRYPT_TKIP
        This can be compiled as a module and it will be called
        "ieee80211_crypt_tkip".
 
-source "net/ieee80211/softmac/Kconfig"