From 249bfe5c71c4bf87bfebb59cba971b66425b08fe Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Tue, 6 Mar 2012 13:30:44 -0800 Subject: [PATCH] --- yaml --- r: 291245 b: refs/heads/master c: 3995deafdae1b802a117b3d6d18bc9e5ce3d1340 h: refs/heads/master i: 291243: 126c8153a9860f06f5e369f20f367de632b10eb9 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-drv.c | 2 +- .../net/wireless/iwlwifi/{iwl-ucode.h => iwl-fw-file.h} | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) rename trunk/drivers/net/wireless/iwlwifi/{iwl-ucode.h => iwl-fw-file.h} (98%) diff --git a/[refs] b/[refs] index d0d236268012..36ed2ae0df2b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c9eec95cb429359efd39a3c87fb1544fe2b77bc5 +refs/heads/master: 3995deafdae1b802a117b3d6d18bc9e5ce3d1340 diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-drv.c b/trunk/drivers/net/wireless/iwlwifi/iwl-drv.c index f1beeab1e601..29a3ae48df6d 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-drv.c +++ b/trunk/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/trunk/drivers/net/wireless/iwlwifi/iwl-ucode.h b/trunk/drivers/net/wireless/iwlwifi/iwl-fw-file.h similarity index 98% rename from trunk/drivers/net/wireless/iwlwifi/iwl-ucode.h rename to trunk/drivers/net/wireless/iwlwifi/iwl-fw-file.h index cdab28784404..7ca6c9526357 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-ucode.h +++ b/trunk/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 @@ -157,4 +157,4 @@ struct iwl_tlv_ucode_header { u8 data[0]; }; -#endif /* __iwl_ucode_h__ */ +#endif /* __iwl_fw_file_h__ */