aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
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 /drivers/net
parent[PATCH] remove driverfs references from init/do_mounts.c (diff)
parent[wireless hostap] automatically select ieee80211 dependency in Kconfig (diff)
downloadlinux-dev-f505380ba7b98ec97bf25300c2a58aeae903530b.tar.xz
linux-dev-f505380ba7b98ec97bf25300c2a58aeae903530b.zip
Merge refs/heads/ieee80211-wifi from master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net')
-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 1445f3f2600f..56f41c714d38 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