diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-04-12 13:50:03 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-04-12 13:50:03 -0400 |
| commit | e049d1ca3094f3d1d94617f456a9961202f96e3a (patch) | |
| tree | a30397ad22f2fbea268bd28fa69c60aad9dfa62a /net/ieee80211/Kconfig | |
| parent | edfac96a92b88d3b0b53e3f8231b74beee9ecd1d (diff) | |
| parent | 80584ff3b99c36ead7e130e453b3a48b18072d18 (diff) | |
Merge branch 'linux-2.6' into for-2.6.22
Diffstat (limited to 'net/ieee80211/Kconfig')
| -rw-r--r-- | net/ieee80211/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ieee80211/Kconfig b/net/ieee80211/Kconfig index a64be6cdf078..6ef766ef9618 100644 --- a/net/ieee80211/Kconfig +++ b/net/ieee80211/Kconfig | |||
| @@ -38,7 +38,7 @@ config IEEE80211_CRYPT_WEP | |||
| 38 | Include software based cipher suites in support of IEEE | 38 | Include software based cipher suites in support of IEEE |
| 39 | 802.11's WEP. This is needed for WEP as well as 802.1x. | 39 | 802.11's WEP. This is needed for WEP as well as 802.1x. |
| 40 | 40 | ||
| 41 | This can be compiled as a modules and it will be called | 41 | This can be compiled as a module and it will be called |
| 42 | "ieee80211_crypt_wep". | 42 | "ieee80211_crypt_wep". |
| 43 | 43 | ||
| 44 | config IEEE80211_CRYPT_CCMP | 44 | config IEEE80211_CRYPT_CCMP |
| @@ -51,7 +51,7 @@ config IEEE80211_CRYPT_CCMP | |||
| 51 | (aka TGi, WPA, WPA2, WPA-PSK, etc.) for use with CCMP enabled | 51 | (aka TGi, WPA, WPA2, WPA-PSK, etc.) for use with CCMP enabled |
| 52 | networks. | 52 | networks. |
| 53 | 53 | ||
| 54 | This can be compiled as a modules and it will be called | 54 | This can be compiled as a module and it will be called |
| 55 | "ieee80211_crypt_ccmp". | 55 | "ieee80211_crypt_ccmp". |
| 56 | 56 | ||
| 57 | config IEEE80211_CRYPT_TKIP | 57 | config IEEE80211_CRYPT_TKIP |
| @@ -66,7 +66,7 @@ config IEEE80211_CRYPT_TKIP | |||
| 66 | (aka TGi, WPA, WPA2, WPA-PSK, etc.) for use with TKIP enabled | 66 | (aka TGi, WPA, WPA2, WPA-PSK, etc.) for use with TKIP enabled |
| 67 | networks. | 67 | networks. |
| 68 | 68 | ||
| 69 | This can be compiled as a modules and it will be called | 69 | This can be compiled as a module and it will be called |
| 70 | "ieee80211_crypt_tkip". | 70 | "ieee80211_crypt_tkip". |
| 71 | 71 | ||
| 72 | source "net/ieee80211/softmac/Kconfig" | 72 | source "net/ieee80211/softmac/Kconfig" |