aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless
diff options
context:
space:
mode:
authorRon Rindjunsky <ron.rindjunsky@intel.com>2008-06-13 03:44:54 -0400
committerJohn W. Linville <linville@tuxdriver.com>2008-06-14 12:18:11 -0400
commit14b3d3387c95cc78f3d740ea53577d9ff41415e3 (patch)
tree91ae0a7bf2bc019f9ca90f4dec6a6a6a9e5e12a5 /drivers/net/wireless
parent5d72a1f5b6da334f8722255c766fdbcd4c1b4c51 (diff)
iwlwifi: remove 4965 prefix from iwl4965_ucode
The patch removes 4965 prefix from iwl4965_ucode. Signed-off-by: Ron Rindjunsky <ron.rindjunsky@intel.com> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Zhu Yi <yi.zhu@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-dev.h2
-rw-r--r--drivers/net/wireless/iwlwifi/iwl4965-base.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h
index e6188f087ea6..c508b11b6fc8 100644
--- a/drivers/net/wireless/iwlwifi/iwl-dev.h
+++ b/drivers/net/wireless/iwlwifi/iwl-dev.h
@@ -480,7 +480,7 @@ struct fw_desc {
480}; 480};
481 481
482/* uCode file layout */ 482/* uCode file layout */
483struct iwl4965_ucode { 483struct iwl_ucode {
484 __le32 ver; /* major/minor/subminor */ 484 __le32 ver; /* major/minor/subminor */
485 __le32 inst_size; /* bytes of runtime instructions */ 485 __le32 inst_size; /* bytes of runtime instructions */
486 __le32 data_size; /* bytes of runtime data */ 486 __le32 data_size; /* bytes of runtime data */
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c
index c179b21bd0d8..a9da17ce0e1d 100644
--- a/drivers/net/wireless/iwlwifi/iwl4965-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c
@@ -2002,7 +2002,7 @@ static void iwl4965_nic_start(struct iwl_priv *priv)
2002 */ 2002 */
2003static int iwl4965_read_ucode(struct iwl_priv *priv) 2003static int iwl4965_read_ucode(struct iwl_priv *priv)
2004{ 2004{
2005 struct iwl4965_ucode *ucode; 2005 struct iwl_ucode *ucode;
2006 int ret; 2006 int ret;
2007 const struct firmware *ucode_raw; 2007 const struct firmware *ucode_raw;
2008 const char *name = priv->cfg->fw_name; 2008 const char *name = priv->cfg->fw_name;