diff --git a/[refs] b/[refs] index 5c8eb6431f0f..19d3ff424392 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 76bb77e03f5b01fb83fb9fa79febba6e499f948b +refs/heads/master: 923effd8d231ac480c6007e2a377c001a343a0ba diff --git a/trunk/drivers/net/wireless/iwlwifi/Kconfig b/trunk/drivers/net/wireless/iwlwifi/Kconfig index abd0ce0954da..c91e5f908955 100644 --- a/trunk/drivers/net/wireless/iwlwifi/Kconfig +++ b/trunk/drivers/net/wireless/iwlwifi/Kconfig @@ -33,6 +33,15 @@ config IWL4965_QOS This option will enable wireless quality of service (QoS) for the iw4965 driver. +config IWL4965_HT + bool "Enable 802.11n HT features in iwl4965 driver" + depends on EXPERIMENTAL + depends on IWL4965 && IWL4965_QOS + depends on n + ---help--- + This option enables IEEE 802.11n High Throughput features + for the iwl4965 driver. + config IWL4965_SPECTRUM_MEASUREMENT bool "Enable Spectrum Measurement in iw4965 driver" depends on IWL4965 @@ -46,14 +55,6 @@ config IWL4965_SENSITIVITY This option will enable sensitivity calibration for the iwl4965 driver. -config IWL4965_HT - bool "Enable 802.11n HT features in iwl4965 driver" - depends on EXPERIMENTAL - depends on IWL4965 && MAC80211_HT - ---help--- - This option enables IEEE 802.11n High Throughput features - for the iwl4965 driver. - config IWL4965_DEBUG bool "Enable full debugging output in iwl4965 driver" depends on IWL4965