buffer_head: fix private_list handling

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

diff --git a/net/ieee80211/Kconfig b/net/ieee80211/Kconfig
index a64be6cdf078f3226d3478ceb700964441073107..bd501046c9c0c0ef4fa5512e7c565e62f53e24a0 100644 (file)
--- a/net/ieee80211/Kconfig
+++ b/net/ieee80211/Kconfig
@@ -1,8 +1,9 @@
 config IEEE80211
 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
        ---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"
 
 config IEEE80211_DEBUG
        bool "Enable full debugging output"


@@ -38,7 +39,7 @@ config IEEE80211_CRYPT_WEP
        Include software based cipher suites in support of IEEE
        802.11's WEP.  This is needed for WEP as well as 802.1x.
 
        Include software based cipher suites in support of IEEE
        802.11's WEP.  This is needed for WEP as well as 802.1x.
 

-       This can be compiled as a modules and it will be called
+       This can be compiled as a module and it will be called

        "ieee80211_crypt_wep".
 
 config IEEE80211_CRYPT_CCMP
        "ieee80211_crypt_wep".
 
 config IEEE80211_CRYPT_CCMP


@@ -51,12 +52,13 @@ config IEEE80211_CRYPT_CCMP
        (aka TGi, WPA, WPA2, WPA-PSK, etc.) for use with CCMP enabled
        networks.
 
        (aka TGi, WPA, WPA2, WPA-PSK, etc.) for use with CCMP enabled
        networks.
 

-       This can be compiled as a modules and it will be called
+       This can be compiled as a module and it will be called

        "ieee80211_crypt_ccmp".
 
 config IEEE80211_CRYPT_TKIP
        tristate "IEEE 802.11i TKIP encryption"
        "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
        select CRYPTO
        select CRYPTO_MICHAEL_MIC
        select CRYPTO_ECB


@@ -66,7 +68,7 @@ config IEEE80211_CRYPT_TKIP
        (aka TGi, WPA, WPA2, WPA-PSK, etc.) for use with TKIP enabled
        networks.
 
        (aka TGi, WPA, WPA2, WPA-PSK, etc.) for use with TKIP enabled
        networks.
 

-       This can be compiled as a modules and it will be called
+       This can be compiled as a module and it will be called

        "ieee80211_crypt_tkip".
 
 source "net/ieee80211/softmac/Kconfig"
        "ieee80211_crypt_tkip".
 
 source "net/ieee80211/softmac/Kconfig"