aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-3945.c
diff options
context:
space:
mode:
authorTomas Winkler <tomas.winkler@intel.com>2008-03-04 21:09:31 -0500
committerJohn W. Linville <linville@tuxdriver.com>2008-03-07 16:03:00 -0500
commit4bf775cdc08b8741f78fbf85e3d2e6bebe783d32 (patch)
tree7773151e345b3a5d5f10e6798abf4a9fbf0d2b44 /drivers/net/wireless/iwlwifi/iwl-3945.c
parent82b9a1213132aa53ddbcc459ed77a335d031cd2e (diff)
iwlwifi: Take the fw file name from the iwl_cfg.
This patch adds fw_name to iwl_cfg. This allows run time selection of needed fw/ucode file Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-3945.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-3945.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c
index b9097643a64..49b78110432 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945.c
+++ b/drivers/net/wireless/iwlwifi/iwl-3945.c
@@ -2526,11 +2526,13 @@ void iwl3945_hw_cancel_deferred_work(struct iwl3945_priv *priv)
2526 2526
2527static struct iwl_3945_cfg iwl3945_bg_cfg = { 2527static struct iwl_3945_cfg iwl3945_bg_cfg = {
2528 .name = "3945BG", 2528 .name = "3945BG",
2529 .fw_name = "iwlwifi-3945" IWL3945_UCODE_API ".ucode",
2529 .sku = IWL_SKU_G, 2530 .sku = IWL_SKU_G,
2530}; 2531};
2531 2532
2532static struct iwl_3945_cfg iwl3945_abg_cfg = { 2533static struct iwl_3945_cfg iwl3945_abg_cfg = {
2533 .name = "3945ABG", 2534 .name = "3945ABG",
2535 .fw_name = "iwlwifi-3945" IWL3945_UCODE_API ".ucode",
2534 .sku = IWL_SKU_A|IWL_SKU_G, 2536 .sku = IWL_SKU_A|IWL_SKU_G,
2535}; 2537};
2536 2538