diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-01-28 22:23:14 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-01-28 22:23:14 +0100 |
| commit | 3e11210d46a4f252f41db6e442b46026aeddbb59 (patch) | |
| tree | b258375de649a5e04e8d567c850b47c41f8ceb11 /drivers/net/wireless/iwlwifi/iwl-4965.c | |
| parent | ath9k: fix compile error in non-debug ath_debug_stat_tx() stub (diff) | |
| parent | ath9k: Fix power save usage count imbalance on deinit (diff) | |
| download | linux-3e11210d46a4f252f41db6e442b46026aeddbb59.tar.xz linux-3e11210d46a4f252f41db6e442b46026aeddbb59.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts:
drivers/net/wireless/ath/ath9k/init.c
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-4965.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-4965.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c index 053240642b50..7c14eb31d954 100644 --- a/drivers/net/wireless/iwlwifi/iwl-4965.c +++ b/drivers/net/wireless/iwlwifi/iwl-4965.c @@ -2629,6 +2629,7 @@ struct iwl_cfg iwl4965_agn_cfg = { .fw_name_pre = IWL4965_FW_PRE, .ucode_api_max = IWL4965_UCODE_API_MAX, .ucode_api_min = IWL4965_UCODE_API_MIN, + .sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N, .valid_tx_ant = ANT_AB, .valid_rx_ant = ANT_ABC, .eeprom_ver = EEPROM_4965_EEPROM_VERSION, |