Merge branch 'linus' into sched/clock

[pandora-kernel.git] / net / wireless / Kconfig

diff --git a/net/wireless/Kconfig b/net/wireless/Kconfig
index 6426055..ab015c6 100644 (file)
--- a/net/wireless/Kconfig
+++ b/net/wireless/Kconfig
@@ -6,13 +6,13 @@ config NL80211
        depends on CFG80211
        default y
        ---help---
-         This option turns on the new netlink interface
-         (nl80211) support in cfg80211.
+         This option turns on the new netlink interface
+         (nl80211) support in cfg80211.
 
-         If =n, drivers using mac80211 will be configured via
-         wireless extension support provided by that subsystem.
+         If =n, drivers using mac80211 will be configured via
+         wireless extension support provided by that subsystem.
 
-         If unsure, say Y.
+         If unsure, say Y.
 
 config WIRELESS_EXT
        bool "Wireless extensions"
@@ -29,3 +29,14 @@ config WIRELESS_EXT
 
          Say N (if you can) unless you know you need wireless
          extensions for external modules.
+
+config WIRELESS_EXT_SYSFS
+       bool "Wireless extensions sysfs files"
+       default y
+       depends on WIRELESS_EXT && SYSFS
+       help
+         This option enables the deprecated wireless statistics
+         files in /sys/class/net/*/wireless/. The same information
+         is available via the ioctls as well.
+
+         Say Y if you have programs using it (we don't know of any).