diff options
author | David S. Miller <davem@davemloft.net> | 2009-09-09 17:33:45 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-09-09 17:33:45 -0700 |
commit | ea6a634ef7f0ab1d1f48ba0ad4f50e96d6065312 (patch) | |
tree | fbf291540b824183e0d9292906e9570fd344ebaa /net/wireless/Kconfig | |
parent | fa1a9c681377c57e233038e50479e7d7a5cc3108 (diff) | |
parent | b2e3abdc708f8c0eff194af25362fdb239abe241 (diff) | |
download | kernel-crypto-ea6a634ef7f0ab1d1f48ba0ad4f50e96d6065312.tar.gz kernel-crypto-ea6a634ef7f0ab1d1f48ba0ad4f50e96d6065312.tar.xz kernel-crypto-ea6a634ef7f0ab1d1f48ba0ad4f50e96d6065312.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/wireless/Kconfig')
-rw-r--r-- | net/wireless/Kconfig | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/net/wireless/Kconfig b/net/wireless/Kconfig index 68c504fab12..abf7ca3f9ff 100644 --- a/net/wireless/Kconfig +++ b/net/wireless/Kconfig @@ -1,6 +1,15 @@ config CFG80211 - tristate "Improved wireless configuration API" + tristate "cfg80211 - wireless configuration API" depends on RFKILL || !RFKILL + ---help--- + cfg80211 is the Linux wireless LAN (802.11) configuration API. + Enable this if you have a wireless device. + + For more information refer to documentation on the wireless wiki: + + http://wireless.kernel.org/en/developers/Documentation/cfg80211 + + When built as a module it will be called cfg80211. config NL80211_TESTMODE bool "nl80211 testmode command" |