Skip to content

L
linux-davinci
Commit f505380b authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge refs/heads/ieee80211-wifi from... 

Merge refs/heads/ieee80211-wifi from master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
parents 13ae6d81 504be3aa
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
drivers/net/wireless/hostap/Kconfig
View file @ f505380b
config HOSTAP config HOSTAP
tristate "IEEE 802.11 for Host AP (Prism2/2.5/3 and WEP/TKIP/CCMP)" tristate "IEEE 802.11 for Host AP (Prism2/2.5/3 and WEP/TKIP/CCMP)"
depends on NET_RADIO depends on NET_RADIO
select IEEE80211
select IEEE80211_CRYPT_WEP
---help--- ---help---
Shared driver code for IEEE 802.11b wireless cards based on Shared driver code for IEEE 802.11b wireless cards based on
Intersil Prism2/2.5/3 chipset. This driver supports so called Intersil Prism2/2.5/3 chipset. This driver supports so called
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment