diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-25 16:34:56 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-25 16:34:56 -0800 |
| commit | d346f49d0badd80aa9fc699fa9c6d5b23e778eb6 (patch) | |
| tree | 9e9698ffe7966fbe7ce924a30843f87cdfa2646e /drivers/net/wireless/iwlwifi/iwl-4965.c | |
| parent | d87fd25d5ac4cd044e21b749a8f6cac90f093c71 (diff) | |
| parent | b6ce5c33001b1dc83e6a1a6f30c5dccccea651b6 (diff) | |
| download | linux-d346f49d0badd80aa9fc699fa9c6d5b23e778eb6.tar.bz2 | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-4965.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-4965.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c index 484c5fdf7c2a..78706ce8b7ae 100644 --- a/drivers/net/wireless/iwlwifi/iwl-4965.c +++ b/drivers/net/wireless/iwlwifi/iwl-4965.c @@ -2208,7 +2208,7 @@ static struct iwl_lib_ops iwl4965_lib = { }, }; -static struct iwl_ops iwl4965_ops = { +static const struct iwl_ops iwl4965_ops = { .ucode = &iwl4965_ucode, .lib = &iwl4965_lib, .hcmd = &iwl4965_hcmd, @@ -2239,7 +2239,6 @@ struct iwl_cfg iwl4965_agn_cfg = { .broken_powersave = true, .led_compensation = 61, .chain_noise_num_beacons = IWL4965_CAL_NUM_BEACONS, - .sm_ps_mode = WLAN_HT_CAP_SM_PS_DISABLED, }; /* Module firmware */ |