Merge http://git.kernel.org/pub/scm/linux/kernel/git/chr/carl9170fw

[carl9170fw.git] / carlfw / Kconfig

diff --git a/carlfw/Kconfig b/carlfw/Kconfig
index d1a68a1c60b813497a3268db6960468bdf92d8d3..1c5718ae60caa986ce1107e07043814dce4ced12 100644 (file)
--- a/carlfw/Kconfig
+++ b/carlfw/Kconfig
@@ -133,24 +133,6 @@ config CARL9170FW_PSM
         Firmware will automatically turn it on again, when the
         PRETBTT event fires.
 
-config CARL9170FW_DELAYED_TX
-       def_bool n
-       prompt "Delay and reorder TX"
-       depends on CARL9170FW_EXPERIMENTAL
-       ---help---
-        Delay incoming TX' from the application until wlan_complete
-        has finished.
-
-        This feature is necessary to keep A-MPDUs partially ordered.
-
-        Doesn't work 100% yet, but in most cases other HW designs can
-        deal with the fallout.
-
-config CARL9170FW_TX_AMPDU
-       def_bool n
-       prompt "Firmware-supported ampdu scheduling"
-       depends on CARL9170FW_EXPERIMENTAL
-
 config CARL9170FW_WOL_OPTION
        def_bool n
        prompt "Wakeup on WLAN"