diff options
| author | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-02 05:01:35 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-02 05:01:35 -0400 |
| commit | f505380ba7b98ec97bf25300c2a58aeae903530b (patch) | |
| tree | 9ebec4563616b2ffe1b945ae0d4018bcf841291a /drivers | |
| parent | 13ae6d81b963c7b22ab9c158ee5a392fb57579fe (diff) | |
| parent | 504be3aa095903895f9b99abfed40709ff5d1e62 (diff) | |
Merge refs/heads/ieee80211-wifi from master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/wireless/hostap/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/hostap/Kconfig b/drivers/net/wireless/hostap/Kconfig index 1445f3f2600f..56f41c714d38 100644 --- a/drivers/net/wireless/hostap/Kconfig +++ b/drivers/net/wireless/hostap/Kconfig | |||
| @@ -1,6 +1,8 @@ | |||
| 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 NET_RADIO |
| 4 | select IEEE80211 | ||
| 5 | select IEEE80211_CRYPT_WEP | ||
| 4 | ---help--- | 6 | ---help--- |
| 5 | Shared driver code for IEEE 802.11b wireless cards based on | 7 | Shared driver code for IEEE 802.11b wireless cards based on |
| 6 | Intersil Prism2/2.5/3 chipset. This driver supports so called | 8 | Intersil Prism2/2.5/3 chipset. This driver supports so called |