summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@evo.osdl.org>2005-09-02 02:01:35 -0700
committerLinus Torvalds <torvalds@evo.osdl.org>2005-09-02 02:01:35 -0700
commitf505380ba7b98ec97bf25300c2a58aeae903530b (patch)
tree9ebec4563616b2ffe1b945ae0d4018bcf841291a
parent13ae6d81b963c7b22ab9c158ee5a392fb57579fe (diff)
parent504be3aa095903895f9b99abfed40709ff5d1e62 (diff)
downloadlinux-3.10-f505380ba7b98ec97bf25300c2a58aeae903530b.tar.gz
linux-3.10-f505380ba7b98ec97bf25300c2a58aeae903530b.tar.bz2
linux-3.10-f505380ba7b98ec97bf25300c2a58aeae903530b.zip
Merge refs/heads/ieee80211-wifi from master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
-rw-r--r--drivers/net/wireless/hostap/Kconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/hostap/Kconfig b/drivers/net/wireless/hostap/Kconfig
index 1445f3f2600..56f41c714d3 100644
--- a/drivers/net/wireless/hostap/Kconfig
+++ b/drivers/net/wireless/hostap/Kconfig
@@ -1,6 +1,8 @@
config HOSTAP
tristate "IEEE 802.11 for Host AP (Prism2/2.5/3 and WEP/TKIP/CCMP)"
depends on NET_RADIO
+ select IEEE80211
+ select IEEE80211_CRYPT_WEP
---help---
Shared driver code for IEEE 802.11b wireless cards based on
Intersil Prism2/2.5/3 chipset. This driver supports so called