---

yaml --- r: 291245 b: refs/heads/master c: 3995dea h: refs/heads/master i: 291243: 126c815 v: v3
git-mirror · Mar 7, 2012 · 249bfe5 · 249bfe5
1 parent e4324b9
commit 249bfe5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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 → ...rivers/net/wireless/iwlwifi/iwl-fw-file.h b/.../drivers/net/wireless/iwlwifi/iwl-ucode.h → ...rivers/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__ */