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 262c2471ec65e476a536543d76988af856c4a7fa..1c5718ae60caa986ce1107e07043814dce4ced12 100644 (file)
--- a/carlfw/Kconfig
+++ b/carlfw/Kconfig
@@ -1,13 +1,7 @@
 menu "General"
 
-config CARL9170FW_MAKE_RELEASE
-       def_bool y
-       prompt "Update/Generate new release/revision files"
-
 config CARL9170FW_RELEASE_VERSION
        int
-       depends on CARL9170FW_MAKE_RELEASE
-       prompt "Major CARL9170 Firmware Revision"
        default 1
 
 menu "Selectable Hardware Options"
@@ -139,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"
@@ -182,7 +158,7 @@ config CARL9170FW_WOL_PROBE_REQUEST
        def_bool n
        prompt "Probe Request"
        depends on CARL9170FW_WOL_OPTION
-       select CARL9170FW_WOL_CHECK
+       select CARL9170FW_WOL
        ---help---
         Scan probe requests for a given SSID.