Merge remote-tracking branch 'iwlwifi-fixes/master' into iwlwifi-next

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

diff --git a/drivers/net/wireless/iwlwifi/Kconfig b/drivers/net/wireless/iwlwifi/Kconfig
index f89f446e5c8ae32b5dccc42cae6234ad75283ff8..efe3cf3a8454bc0c770ba606a88094a81f98909d 100644 (file)
--- a/drivers/net/wireless/iwlwifi/Kconfig
+++ b/drivers/net/wireless/iwlwifi/Kconfig
@@ -22,6 +22,7 @@ config IWLWIFI
                Intel 3160 Wi-Fi Adapter
                Intel 7265 Wi-Fi Adapter
                Intel 3165 Wi-Fi Adapter
+               Intel 8260 Wi-Fi Adapter
 
 
          This driver uses the kernel's mac80211 subsystem.
@@ -54,16 +55,17 @@ config IWLDVM
        tristate "Intel Wireless WiFi DVM Firmware support"
        default IWLWIFI
        help
-         This is the driver that supports the DVM firmware which is
-         used by most existing devices (with the exception of 7260
-         and 3160).
+         This is the driver that supports the DVM firmware. The list
+         of the devices that use this firmware is available here:
+         https://wireless.wiki.kernel.org/en/users/drivers/iwlwifi#firmware
 
 config IWLMVM
        tristate "Intel Wireless WiFi MVM Firmware support"
        select WANT_DEV_COREDUMP
        help
-         This is the driver that supports the MVM firmware which is
-         currently only available for 7260 and 3160 devices.
+         This is the driver that supports the MVM firmware. The list
+         of the devices that use this firmware is available here:
+         https://wireless.wiki.kernel.org/en/users/drivers/iwlwifi#firmware
 
 # don't call it _MODULE -- will confuse Kconfig/fixdep/...
 config IWLWIFI_OPMODE_MODULAR