aboutsummaryrefslogtreecommitdiffstats
path: root/net/ieee80211/softmac/Kconfig
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-06-08 15:48:25 -0400
committerJeff Garzik <jeff@garzik.org>2006-06-08 15:48:25 -0400
commitba9b28d19a3251bb1dfe6a6f8cc89b96fb85f683 (patch)
treed770bd8c536771cb3804abb51ed029d7dd9d30d2 /net/ieee80211/softmac/Kconfig
parent862fc81b62c2d41a7e0b97b90844c80e59c7b0f1 (diff)
parent5c601d0c942f5aaf7f3cff7e08f61047d70a964e (diff)
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream
Diffstat (limited to 'net/ieee80211/softmac/Kconfig')
-rw-r--r--net/ieee80211/softmac/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ieee80211/softmac/Kconfig b/net/ieee80211/softmac/Kconfig
index f2a27cc6ecb1..2811651cb134 100644
--- a/net/ieee80211/softmac/Kconfig
+++ b/net/ieee80211/softmac/Kconfig
@@ -2,6 +2,7 @@ config IEEE80211_SOFTMAC
2 tristate "Software MAC add-on to the IEEE 802.11 networking stack" 2 tristate "Software MAC add-on to the IEEE 802.11 networking stack"
3 depends on IEEE80211 && EXPERIMENTAL 3 depends on IEEE80211 && EXPERIMENTAL
4 select WIRELESS_EXT 4 select WIRELESS_EXT
5 select IEEE80211_CRYPT_WEP
5 ---help--- 6 ---help---
6 This option enables the hardware independent software MAC addon 7 This option enables the hardware independent software MAC addon
7 for the IEEE 802.11 networking stack. 8 for the IEEE 802.11 networking stack.