brcm47xx: update bcma and ssb to master-2011-07-21

[openwrt.git] / package / madwifi / Config.in

diff --git a/package/madwifi/Config.in b/package/madwifi/Config.in
index 802e52a..7b72eb8 100644 (file)
--- a/package/madwifi/Config.in
+++ b/package/madwifi/Config.in
@@ -1,38 +1,20 @@
-# MadWifi configuration
+menu "Configuration"
+       depends on PACKAGE_kmod-madwifi
 
 config MADWIFI_DEBUG
        bool "Enable compilation of debugging features"
-       depends on DEVEL && PACKAGE_kmod-madwifi
+       depends on DEVEL
        default n
 
 config MADWIFI_COMPRESSION
        bool "Enable Atheros Super A/G Compression"
-       depends on PACKAGE_kmod-madwifi
        depends !TARGET_ar71xx
        default n
        help
          Enables Atheros Super A/G Hardware Compression Engine.
 
-choice
-       prompt "Madwifi version"
-       depends on PACKAGE_kmod-madwifi
-       default MADWIFI_STABLE
-       help
-         This option allows you to select the version of MadWifi to be built.
-
-config MADWIFI_STABLE
-       bool "Use the OpenWrt stable version of madwifi"
-
-config MADWIFI_UPSTREAM
-       depends BROKEN
-       depends !TARGET_atheros
-       bool "Use the upstream release version 0.9.4"
-
-endchoice
-
 config MADWIFI_SINGLE_MODULE
        bool "Combine driver and net80211 into a single module"
-       depends on PACKAGE_kmod-madwifi
        default y
        help
          This option combines all driver and stack related code (except for HAL)
@@ -41,7 +23,6 @@ config MADWIFI_SINGLE_MODULE
 
 choice
        prompt "Rate control algorithm selection"
-       depends on PACKAGE_kmod-madwifi
        default MADWIFI_RCA_MINSTREL
        help
          This option controls how MadWifi chooses its bitrate.
@@ -70,3 +51,5 @@ config MADWIFI_RCA_SAMPLERATE
          average transmission time.
 
 endchoice
+
+endmenu