diff options
| author | Jens Axboe <jaxboe@fusionio.com> | 2010-10-19 03:13:04 -0400 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2010-10-19 03:13:04 -0400 |
| commit | fa251f89903d73989e2f63e13d0eaed1e07ce0da (patch) | |
| tree | 3f7fe779941e3b6d67754dd7c44a32f48ea47c74 /drivers/net/wireless/iwlwifi/iwl-1000.c | |
| parent | dd3932eddf428571762596e17b65f5dc92ca361b (diff) | |
| parent | cd07202cc8262e1669edff0d97715f3dd9260917 (diff) | |
Merge branch 'v2.6.36-rc8' into for-2.6.37/barrier
Conflicts:
block/blk-core.c
drivers/block/loop.c
mm/swapfile.c
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-1000.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-1000.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-1000.c b/drivers/net/wireless/iwlwifi/iwl-1000.c index fec026212326..0b779a41a142 100644 --- a/drivers/net/wireless/iwlwifi/iwl-1000.c +++ b/drivers/net/wireless/iwlwifi/iwl-1000.c | |||
| @@ -265,7 +265,7 @@ struct iwl_cfg iwl1000_bgn_cfg = { | |||
| 265 | .support_ct_kill_exit = true, | 265 | .support_ct_kill_exit = true, |
| 266 | .plcp_delta_threshold = IWL_MAX_PLCP_ERR_EXT_LONG_THRESHOLD_DEF, | 266 | .plcp_delta_threshold = IWL_MAX_PLCP_ERR_EXT_LONG_THRESHOLD_DEF, |
| 267 | .chain_noise_scale = 1000, | 267 | .chain_noise_scale = 1000, |
| 268 | .monitor_recover_period = IWL_MONITORING_PERIOD, | 268 | .monitor_recover_period = IWL_DEF_MONITORING_PERIOD, |
| 269 | .max_event_log_size = 128, | 269 | .max_event_log_size = 128, |
| 270 | .ucode_tracing = true, | 270 | .ucode_tracing = true, |
| 271 | .sensitivity_calib_by_driver = true, | 271 | .sensitivity_calib_by_driver = true, |
| @@ -297,7 +297,7 @@ struct iwl_cfg iwl1000_bg_cfg = { | |||
| 297 | .support_ct_kill_exit = true, | 297 | .support_ct_kill_exit = true, |
| 298 | .plcp_delta_threshold = IWL_MAX_PLCP_ERR_EXT_LONG_THRESHOLD_DEF, | 298 | .plcp_delta_threshold = IWL_MAX_PLCP_ERR_EXT_LONG_THRESHOLD_DEF, |
| 299 | .chain_noise_scale = 1000, | 299 | .chain_noise_scale = 1000, |
| 300 | .monitor_recover_period = IWL_MONITORING_PERIOD, | 300 | .monitor_recover_period = IWL_DEF_MONITORING_PERIOD, |
| 301 | .max_event_log_size = 128, | 301 | .max_event_log_size = 128, |
| 302 | .ucode_tracing = true, | 302 | .ucode_tracing = true, |
| 303 | .sensitivity_calib_by_driver = true, | 303 | .sensitivity_calib_by_driver = true, |