Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

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

diff --git a/net/wireless/Kconfig b/net/wireless/Kconfig
index 3c3bc9e..4428dd5 100644 (file)
--- a/net/wireless/Kconfig
+++ b/net/wireless/Kconfig
@@ -1,5 +1,6 @@
 config CFG80211
-        tristate "Improved wireless configuration API"
+       tristate "Improved wireless configuration API"
+       depends on RFKILL || !RFKILL
 
 config CFG80211_REG_DEBUG
        bool "cfg80211 regulatory debugging"
@@ -10,6 +11,14 @@ config CFG80211_REG_DEBUG
 
          If unsure, say N.
 
+config CFG80211_DEBUGFS
+       bool "cfg80211 DebugFS entries"
+       depends on CFG80211 && DEBUG_FS
+       ---help---
+         You can enable this if you want to debugfs entries for cfg80211.
+
+         If unsure, say N.
+
 config WIRELESS_OLD_REGULATORY
        bool "Old wireless static regulatory definitions"
        default n