Merge remote branch 'wireless-next/master' into ath6kl-next

[cascardo/linux.git] / drivers / net / wireless / ath / ath9k / Kconfig

diff --git a/drivers/net/wireless/ath/ath9k/Kconfig b/drivers/net/wireless/ath/ath9k/Kconfig
index d9c08c6..dc6be4a 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/Kconfig
+++ b/drivers/net/wireless/ath/ath9k/Kconfig
@@ -2,6 +2,9 @@ config ATH9K_HW
        tristate
 config ATH9K_COMMON
        tristate
+config ATH9K_DFS_DEBUGFS
+       def_bool y
+       depends on ATH9K_DEBUGFS && ATH9K_DFS_CERTIFIED
 
 config ATH9K
        tristate "Atheros 802.11n wireless cards support"
@@ -25,6 +28,7 @@ config ATH9K
 
 config ATH9K_PCI
        bool "Atheros ath9k PCI/PCIe bus support"
+       default y
        depends on ATH9K && PCI
        ---help---
          This option enables the PCI bus support in ath9k.
@@ -50,6 +54,25 @@ config ATH9K_DEBUGFS
 
          Also required for changing debug message flags at run time.
 
+config ATH9K_DFS_CERTIFIED
+       bool "Atheros DFS support for certified platforms"
+       depends on ATH9K && EXPERT
+       default n
+       ---help---
+         This option enables DFS support for initiating radiation on
+         ath9k. There is no way to dynamically detect if a card was DFS
+         certified and as such this is left as a build time option. This
+         option should only be enabled by system integrators that can
+         guarantee that all the platforms that their kernel will run on
+         have obtained appropriate regulatory body certification for a
+         respective Atheros card by using ath9k on the target shipping
+         platforms.
+
+         This is currently only a placeholder for future DFS support,
+         as DFS support requires more components that still need to be
+         developed. At this point enabling this option won't do anything
+         except increase code size.
+
 config ATH9K_RATE_CONTROL
        bool "Atheros ath9k rate control"
        depends on ATH9K
@@ -58,6 +81,14 @@ config ATH9K_RATE_CONTROL
          Say Y, if you want to use the ath9k specific rate control
          module instead of minstrel_ht.
 
+config ATH9K_BTCOEX_SUPPORT
+       bool "Atheros ath9k bluetooth coexistence support"
+       depends on ATH9K
+       default y
+       ---help---
+         Say Y, if you want to use the ath9k radios together with
+         Bluetooth modules in the same system.
+
 config ATH9K_HTC
        tristate "Atheros HTC based wireless cards support"
        depends on USB && MAC80211