summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2012-03-06 13:30:44 -0800
committerJohn W. Linville <linville@tuxdriver.com>2012-03-07 13:51:50 -0500
commit3995deafdae1b802a117b3d6d18bc9e5ce3d1340 (patch)
tree82baa1233df0738436e647102de32a2d80d1f35e /drivers
parentc9eec95cb429359efd39a3c87fb1544fe2b77bc5 (diff)
downloadop-kernel-dev-3995deafdae1b802a117b3d6d18bc9e5ce3d1340.zip
op-kernel-dev-3995deafdae1b802a117b3d6d18bc9e5ce3d1340.tar.gz
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-drv.c2
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-fw-file.h (renamed from drivers/net/wireless/iwlwifi/iwl-ucode.h)6
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-drv.c b/drivers/net/wireless/iwlwifi/iwl-drv.c
index f1beeab..29a3ae4 100644
--- 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
index cdab287..7ca6c95 100644
--- 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__ */
OpenPOWER on IntegriCloud