From: Ron Rindjunsky Date: Fri, 13 Jun 2008 07:44:54 +0000 (+0800) Subject: iwlwifi: remove 4965 prefix from iwl4965_ucode X-Git-Tag: v2.6.27-rc1~969^2~324^2~17 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=14b3d3387c95cc78f3d740ea53577d9ff41415e3;p=linux-2.6-omap-h63xx.git iwlwifi: remove 4965 prefix from iwl4965_ucode The patch removes 4965 prefix from iwl4965_ucode. Signed-off-by: Ron Rindjunsky Signed-off-by: Tomas Winkler Signed-off-by: Zhu Yi Signed-off-by: John W. Linville --- diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h index e6188f087ea..c508b11b6fc 100644 --- a/drivers/net/wireless/iwlwifi/iwl-dev.h +++ b/drivers/net/wireless/iwlwifi/iwl-dev.h @@ -480,7 +480,7 @@ struct fw_desc { }; /* uCode file layout */ -struct iwl4965_ucode { +struct iwl_ucode { __le32 ver; /* major/minor/subminor */ __le32 inst_size; /* bytes of runtime instructions */ __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 c179b21bd0d..a9da17ce0e1 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) */ static int iwl4965_read_ucode(struct iwl_priv *priv) { - struct iwl4965_ucode *ucode; + struct iwl_ucode *ucode; int ret; const struct firmware *ucode_raw; const char *name = priv->cfg->fw_name;