diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-04-29 22:38:01 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-04-29 22:38:01 -0400 |
| commit | 49e1900d4cc2e7bcecb681fe60f0990bec2dcce8 (patch) | |
| tree | 253801ebf57e0a23856a2c7be129c2c178f62fdf /drivers/net/wireless/hostap/Kconfig | |
| parent | 34f6d749c0a328817d5e36274e53121c1db734dc (diff) | |
| parent | b9099ff63c75216d6ca10bce5a1abcd9293c27e6 (diff) | |
Merge branch 'linux-2.6' into for-2.6.22
Diffstat (limited to 'drivers/net/wireless/hostap/Kconfig')
| -rw-r--r-- | drivers/net/wireless/hostap/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/hostap/Kconfig b/drivers/net/wireless/hostap/Kconfig index 308f773ad566..1fef33169fdd 100644 --- a/drivers/net/wireless/hostap/Kconfig +++ b/drivers/net/wireless/hostap/Kconfig | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | config HOSTAP | 1 | config HOSTAP |
| 2 | tristate "IEEE 802.11 for Host AP (Prism2/2.5/3 and WEP/TKIP/CCMP)" | 2 | tristate "IEEE 802.11 for Host AP (Prism2/2.5/3 and WEP/TKIP/CCMP)" |
| 3 | depends on NET_RADIO | 3 | depends on WLAN_80211 |
| 4 | select WIRELESS_EXT | ||
| 4 | select IEEE80211 | 5 | select IEEE80211 |
| 5 | select IEEE80211_CRYPT_WEP | 6 | select IEEE80211_CRYPT_WEP |
| 6 | ---help--- | 7 | ---help--- |