diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2013-04-03 12:27:29 +0200 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2013-04-03 12:27:29 +0200 |
commit | 0ed2aef9b3bffe598045b62a31a50d912eee92d8 (patch) | |
tree | d7dda12955c838f531727d2775d09c4e04bdf066 /drivers/net/wireless/iwlwifi/iwl-modparams.h | |
parent | tick: Change log level of NOHZ: local_softirq_pending message (diff) | |
parent | ARM: bcm281xx: Add timer driver (driver portion) (diff) | |
download | linux-0ed2aef9b3bffe598045b62a31a50d912eee92d8.tar.xz linux-0ed2aef9b3bffe598045b62a31a50d912eee92d8.zip |
Merge branch 'fortglx/3.10/time' of git://git.linaro.org/people/jstultz/linux into timers/core
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-modparams.h')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-modparams.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-modparams.h b/drivers/net/wireless/iwlwifi/iwl-modparams.h index e5e3a79eae2f..2c2a729092f5 100644 --- a/drivers/net/wireless/iwlwifi/iwl-modparams.h +++ b/drivers/net/wireless/iwlwifi/iwl-modparams.h @@ -91,7 +91,7 @@ enum iwl_power_level { * @sw_crypto: using hardware encryption, default = 0 * @disable_11n: disable 11n capabilities, default = 0, * use IWL_DISABLE_HT_* constants - * @amsdu_size_8K: enable 8K amsdu size, default = 1 + * @amsdu_size_8K: enable 8K amsdu size, default = 0 * @restart_fw: restart firmware, default = 1 * @plcp_check: enable plcp health check, default = true * @wd_disable: enable stuck queue check, default = 0 |