Merge branch 'for-3.11' of git://linux-nfs.org/~bfields/linux

[karo-tx-linux.git] / drivers / net / wireless / iwlwifi / Kconfig

diff --git a/drivers/net/wireless/iwlwifi/Kconfig b/drivers/net/wireless/iwlwifi/Kconfig
index 56c2040a955b89263e86930d6dc146f2e869b9fc..cbaa5c2c410f7f8b5cc5cc4c2807fd9fa95f657e 100644 (file)
--- a/drivers/net/wireless/iwlwifi/Kconfig
+++ b/drivers/net/wireless/iwlwifi/Kconfig
@@ -128,16 +128,6 @@ config IWLWIFI_DEVICE_TRACING
          occur.
 endmenu
 
-config IWLWIFI_DEVICE_TESTMODE
-       def_bool y
-       depends on IWLWIFI
-       depends on NL80211_TESTMODE
-       help
-         This option enables the testmode support for iwlwifi device through
-         NL80211_TESTMODE. This provide the capabilities of enable user space
-         validation applications to interacts with the device through the
-         generic netlink message via NL80211_TESTMODE channel.
-
 config IWLWIFI_P2P
        def_bool y
        bool "iwlwifi experimental P2P support"