aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-09-08 16:52:24 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-08 16:52:24 -0400
commit1ee9bed173acd2f505f4e76e69d13cb2b82963e9 (patch)
treeab013f11162db850e3e0484d7036288f3cfc9833
parent1b11d78cf87a7014f96e5b7fa2e1233cc8081a00 (diff)
parent45ac56ca6403b83ad880083be164c425f4b50882 (diff)
Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
-rw-r--r--net/ieee80211/Kconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ieee80211/Kconfig b/net/ieee80211/Kconfig
index 58ed4319e693..91b16fbf91f0 100644
--- a/net/ieee80211/Kconfig
+++ b/net/ieee80211/Kconfig
@@ -1,6 +1,5 @@
1config IEEE80211 1config IEEE80211
2 tristate "Generic IEEE 802.11 Networking Stack" 2 tristate "Generic IEEE 802.11 Networking Stack"
3 select NET_RADIO
4 ---help--- 3 ---help---
5 This option enables the hardware independent IEEE 802.11 4 This option enables the hardware independent IEEE 802.11
6 networking stack. 5 networking stack.