iwlwifi: rename ucode.h to fw-file.h

That name better reflects the contents
of the file and the fact that it isn't
related to iwl-ucode.c.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/iwlwifi/iwl-drv.c b/drivers/net/wireless/iwlwifi/iwl-drv.c
index f1beeab1e601d1aa31d35a8c43322cf6854064ba..29a3ae48df6d1a19126100739ae6bd581829de80 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-drv.c
+++ b/drivers/net/wireless/iwlwifi/iwl-drv.c
@@ -71,7 +71,7 @@
 #include "iwl-op-mode.h"
 
 /* private includes */
-#include "iwl-ucode.h"
+#include "iwl-fw-file.h"
 
 /**
  * struct iwl_drv - drv common data

diff --git a/drivers/net/wireless/iwlwifi/iwl-ucode.h b/drivers/net/wireless/iwlwifi/iwl-fw-file.h
similarity index 98%
rename from drivers/net/wireless/iwlwifi/iwl-ucode.h
rename to drivers/net/wireless/iwlwifi/iwl-fw-file.h
index cdab287844041744725613e0d659331851b1d468..7ca6c952635769c846d6d00ff97c508a7cd214e4 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-ucode.h
+++ b/drivers/net/wireless/iwlwifi/iwl-fw-file.h
@@ -60,8 +60,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *****************************************************************************/
 
-#ifndef __iwl_ucode_h__
-#define __iwl_ucode_h__
+#ifndef __iwl_fw_file_h__
+#define __iwl_fw_file_h__
 
 #include <linux/netdevice.h>
 
@@ -157,4 +157,4 @@ struct iwl_tlv_ucode_header {
        u8 data[0];
 };
 
-#endif  /* __iwl_ucode_h__ */
+#endif  /* __iwl_fw_file_h__ */