Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[firefly-linux-kernel-4.4.55.git] / drivers / net / wireless / iwlwifi / Kconfig

diff --git a/drivers/net/wireless/iwlwifi/Kconfig b/drivers/net/wireless/iwlwifi/Kconfig
index ba319cba3f1eed94c56c2e671f21828f26b147c4..56c2040a955b89263e86930d6dc146f2e869b9fc 100644 (file)
--- a/drivers/net/wireless/iwlwifi/Kconfig
+++ b/drivers/net/wireless/iwlwifi/Kconfig
@@ -6,7 +6,6 @@ config IWLWIFI
        select LEDS_CLASS
        select LEDS_TRIGGERS
        select MAC80211_LEDS
-       select IWLDVM
        ---help---
          Select to build the driver supporting the:
 
@@ -45,6 +44,7 @@ config IWLWIFI
 config IWLDVM
        tristate "Intel Wireless WiFi DVM Firmware support"
        depends on IWLWIFI
+       default IWLWIFI
        help
          This is the driver supporting the DVM firmware which is
          currently the only firmware available for existing devices.
@@ -58,6 +58,15 @@ config IWLMVM
 
          Say yes if you have such a device.
 
+# don't call it _MODULE -- will confuse Kconfig/fixdep/...
+config IWLWIFI_OPMODE_MODULAR
+       bool
+       default y if IWLDVM=m
+       default y if IWLMVM=m
+
+comment "WARNING: iwlwifi is useless without IWLDVM or IWLMVM"
+       depends on IWLWIFI && IWLDVM=n && IWLMVM=n
+
 menu "Debugging Options"
        depends on IWLWIFI