diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-05-05 16:14:16 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-05-05 16:14:16 -0400 |
| commit | 83163244f845c296a118ce85c653872dbff6abfe (patch) | |
| tree | ce2eac695a1c198f23d537e20ed86c16ece21f7e /drivers/net/wireless/iwlwifi/iwl-1000.c | |
| parent | 0a12761bcd5646691c5d16dd93df84d1b8849285 (diff) | |
| parent | adfba3c7c026a6a5560d2a43fefc9b198cb74462 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts:
drivers/net/wireless/libertas_tf/cmd.c
drivers/net/wireless/libertas_tf/main.c
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-1000.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-1000.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-1000.c b/drivers/net/wireless/iwlwifi/iwl-1000.c index 8431ffce37d3..fb59af2d41c6 100644 --- a/drivers/net/wireless/iwlwifi/iwl-1000.c +++ b/drivers/net/wireless/iwlwifi/iwl-1000.c | |||
| @@ -282,7 +282,6 @@ struct iwl_cfg iwl1000_bg_cfg = { | |||
| 282 | .use_bsm = false, | 282 | .use_bsm = false, |
| 283 | .max_ll_items = OTP_MAX_LL_ITEMS_1000, | 283 | .max_ll_items = OTP_MAX_LL_ITEMS_1000, |
| 284 | .shadow_ram_support = false, | 284 | .shadow_ram_support = false, |
| 285 | .ht_greenfield_support = true, | ||
| 286 | .led_compensation = 51, | 285 | .led_compensation = 51, |
| 287 | .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS, | 286 | .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS, |
| 288 | .support_ct_kill_exit = true, | 287 | .support_ct_kill_exit = true, |