aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl3945-base.c
diff options
context:
space:
mode:
authorKolekar, Abhijeet <abhijeet.kolekar@intel.com>2008-12-18 21:37:21 -0500
committerJohn W. Linville <linville@tuxdriver.com>2009-01-29 15:59:06 -0500
commita78fe754e0e5a77ca968ee0c348f027e84659d8b (patch)
tree70df15e438763db92c3b0d0647f437331c9be2e5 /drivers/net/wireless/iwlwifi/iwl3945-base.c
parent85d4149533e07e5ca4c94010a52fe5496d998611 (diff)
iwl3945: remove duplicate structures from iwl-3945.h
The patch renames and deletes duplicate structure from iwl-3945.h. The following structures are renamed with iwlwifi counterparts: 1) iwl3945_ac_qos 2) iwl3945_ucode 3) iwl3945_qos_capabity Signed-off-by: Abhijeet Kolekar <abhijeet.kolekar@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/iwlwifi/iwl3945-base.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl3945-base.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index c597c2422927..313826da45ca 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -5228,7 +5228,7 @@ static void iwl3945_nic_start(struct iwl3945_priv *priv)
5228 */ 5228 */
5229static int iwl3945_read_ucode(struct iwl3945_priv *priv) 5229static int iwl3945_read_ucode(struct iwl3945_priv *priv)
5230{ 5230{
5231 struct iwl3945_ucode *ucode; 5231 struct iwl_ucode *ucode;
5232 int ret = -EINVAL, index; 5232 int ret = -EINVAL, index;
5233 const struct firmware *ucode_raw; 5233 const struct firmware *ucode_raw;
5234 /* firmware file name contains uCode/driver compatibility version */ 5234 /* firmware file name contains uCode/driver compatibility version */