Merge tag 'sound-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[deliverable/linux.git] / drivers / net / wireless / intel / iwlwifi / Kconfig

diff --git a/drivers/net/wireless/intel/iwlwifi/Kconfig b/drivers/net/wireless/intel/iwlwifi/Kconfig
index 16c4f383488fcc5160d22dca5980d72bb1a78edd..492035f406e9fa633a9371f697fd6281d6122c7f 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/Kconfig
+++ b/drivers/net/wireless/intel/iwlwifi/Kconfig
@@ -88,16 +88,6 @@ config IWLWIFI_BCAST_FILTERING
          If unsure, don't enable this option, as some programs might
          expect incoming broadcasts for their normal operations.
 
-config IWLWIFI_UAPSD
-       bool "enable U-APSD by default"
-       depends on IWLMVM
-       help
-         Say Y here to enable U-APSD by default. This may cause
-         interoperability problems with some APs, manifesting in lower than
-         expected throughput due to those APs not enabling aggregation
-
-         If unsure, say N.
-
 config IWLWIFI_PCIE_RTPM
        bool "Enable runtime power management mode for PCIe devices"
        depends on IWLMVM && PM