From d9fd0c9969282609b663a1d933f0777118dd084c Mon Sep 17 00:00:00 2001 From: Tomas Winkler Date: Thu, 25 Oct 2007 17:15:41 +0800 Subject: [PATCH] iwlwifi: Renames struct fw_image_desc to struct fw_desc This patche shortens the name of struct fw_image_desc to be struct fw_desc. Signed-off-by: Tomas Winkler Signed-off-by: Zhu Yi Signed-off-by: John W. Linville --- drivers/net/wireless/iwlwifi/iwl-priv.h | 12 ++++++------ drivers/net/wireless/iwlwifi/iwlwifi.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/net/wireless/iwlwifi/iwl-priv.h b/drivers/net/wireless/iwlwifi/iwl-priv.h index f43679a42ae0..c25f2ffccfff 100644 --- a/drivers/net/wireless/iwlwifi/iwl-priv.h +++ b/drivers/net/wireless/iwlwifi/iwl-priv.h @@ -102,12 +102,12 @@ struct iwl_priv { void __iomem *hw_base; /* uCode images, save to reload in case of failure */ - struct fw_image_desc ucode_code; /* runtime inst */ - struct fw_image_desc ucode_data; /* runtime data original */ - struct fw_image_desc ucode_data_backup; /* runtime data save/restore */ - struct fw_image_desc ucode_init; /* initialization inst */ - struct fw_image_desc ucode_init_data; /* initialization data */ - struct fw_image_desc ucode_boot; /* bootstrap inst */ + struct fw_desc ucode_code; /* runtime inst */ + struct fw_desc ucode_data; /* runtime data original */ + struct fw_desc ucode_data_backup; /* runtime data save/restore */ + struct fw_desc ucode_init; /* initialization inst */ + struct fw_desc ucode_init_data; /* initialization data */ + struct fw_desc ucode_boot; /* bootstrap inst */ struct iwl_rxon_time_cmd rxon_timing; diff --git a/drivers/net/wireless/iwlwifi/iwlwifi.h b/drivers/net/wireless/iwlwifi/iwlwifi.h index c5c9c5d7dce5..90716006beac 100644 --- a/drivers/net/wireless/iwlwifi/iwlwifi.h +++ b/drivers/net/wireless/iwlwifi/iwlwifi.h @@ -497,7 +497,7 @@ struct iwl_station_entry { }; /* one for each uCode image (inst/data, boot/init/runtime) */ -struct fw_image_desc { +struct fw_desc { void *v_addr; /* access by driver */ dma_addr_t p_addr; /* access by card's busmaster DMA */ u32 len; /* bytes */