wl1251: rename wl12xx.h to wl1251.h

wl12xx.h is now only used by 1251 code, so we can rename it. Signed-off-by: Kalle Valo <kalle.valo@nokia.com> Reviewed-by: Vidhya Govindan <vidhya.govindan@nokia.com> Reviewed-by: Luciano Coelho <luciano.coelho@nokia.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
git-mirror · Jul 10, 2009 · 1367411 · 1367411
1 parent ef2f8d4
commit 1367411
Show file tree

Hide file tree

Showing 19 changed files with 18 additions and 17 deletions.
diff --git a/drivers/net/wireless/wl12xx/reg.h b/drivers/net/wireless/wl12xx/reg.h
@@ -26,7 +26,6 @@
 #define __REG_H__
 
 #include <linux/bitops.h>
-#include "wl12xx.h"
 
 #define REGISTERS_BASE 0x00300000
 #define DRPW_BASE      0x00310000

diff --git a/drivers/net/wireless/wl12xx/wl12xx.h → drivers/net/wireless/wl12xx/wl1251.h b/drivers/net/wireless/wl12xx/wl12xx.h → drivers/net/wireless/wl12xx/wl1251.h
diff --git a/drivers/net/wireless/wl12xx/wl1251_acx.c b/drivers/net/wireless/wl12xx/wl1251_acx.c
@@ -4,7 +4,7 @@
 #include <linux/crc7.h>
 #include <linux/spi/spi.h>
 
-#include "wl12xx.h"
+#include "wl1251.h"
 #include "wl12xx_80211.h"
 #include "reg.h"
 #include "wl1251_spi.h"

diff --git a/drivers/net/wireless/wl12xx/wl1251_acx.h b/drivers/net/wireless/wl12xx/wl1251_acx.h
@@ -25,7 +25,7 @@
 #ifndef __WL12XX_ACX_H__
 #define __WL12XX_ACX_H__
 
-#include "wl12xx.h"
+#include "wl1251.h"
 #include "wl1251_cmd.h"
 
 /* Target's information element */

diff --git a/drivers/net/wireless/wl12xx/wl1251_boot.h b/drivers/net/wireless/wl12xx/wl1251_boot.h
@@ -24,7 +24,7 @@
 #ifndef __BOOT_H__
 #define __BOOT_H__
 
-#include "wl12xx.h"
+#include "wl1251.h"
 
 int wl12xx_boot_soft_reset(struct wl12xx *wl);
 int wl12xx_boot_init_seq(struct wl12xx *wl);

diff --git a/drivers/net/wireless/wl12xx/wl1251_cmd.c b/drivers/net/wireless/wl12xx/wl1251_cmd.c
@@ -4,7 +4,7 @@
 #include <linux/crc7.h>
 #include <linux/spi/spi.h>
 
-#include "wl12xx.h"
+#include "wl1251.h"
 #include "wl12xx_80211.h"
 #include "reg.h"
 #include "wl1251_spi.h"

diff --git a/drivers/net/wireless/wl12xx/wl1251_cmd.h b/drivers/net/wireless/wl12xx/wl1251_cmd.h
@@ -25,7 +25,7 @@
 #ifndef __WL12XX_CMD_H__
 #define __WL12XX_CMD_H__
 
-#include "wl12xx.h"
+#include "wl1251.h"
 
 struct acx_header;
 

diff --git a/drivers/net/wireless/wl12xx/wl1251_debugfs.c b/drivers/net/wireless/wl12xx/wl1251_debugfs.c
@@ -25,7 +25,7 @@
 
 #include <linux/skbuff.h>
 
-#include "wl12xx.h"
+#include "wl1251.h"
 #include "wl1251_acx.h"
 #include "wl1251_ps.h"
 

diff --git a/drivers/net/wireless/wl12xx/wl1251_debugfs.h b/drivers/net/wireless/wl12xx/wl1251_debugfs.h
@@ -24,7 +24,7 @@
 #ifndef WL12XX_DEBUGFS_H
 #define WL12XX_DEBUGFS_H
 
-#include "wl12xx.h"
+#include "wl1251.h"
 
 int wl12xx_debugfs_init(struct wl12xx *wl);
 void wl12xx_debugfs_exit(struct wl12xx *wl);

diff --git a/drivers/net/wireless/wl12xx/wl1251_event.c b/drivers/net/wireless/wl12xx/wl1251_event.c
@@ -22,7 +22,7 @@
  *
  */
 
-#include "wl12xx.h"
+#include "wl1251.h"
 #include "reg.h"
 #include "wl1251_spi.h"
 #include "wl1251_event.h"

diff --git a/drivers/net/wireless/wl12xx/wl1251_init.h b/drivers/net/wireless/wl12xx/wl1251_init.h
@@ -24,7 +24,7 @@
 #ifndef __WL12XX_INIT_H__
 #define __WL12XX_INIT_H__
 
-#include "wl12xx.h"
+#include "wl1251.h"
 
 int wl12xx_hw_init_hwenc_config(struct wl12xx *wl);
 int wl12xx_hw_init_templates_config(struct wl12xx *wl);

diff --git a/drivers/net/wireless/wl12xx/wl1251_main.c b/drivers/net/wireless/wl12xx/wl1251_main.c
@@ -31,7 +31,7 @@
 #include <linux/etherdevice.h>
 #include <linux/spi/wl12xx.h>
 
-#include "wl12xx.h"
+#include "wl1251.h"
 #include "wl12xx_80211.h"
 #include "reg.h"
 #include "wl1251_ops.h"

diff --git a/drivers/net/wireless/wl12xx/wl1251_netlink.c b/drivers/net/wireless/wl12xx/wl1251_netlink.c
@@ -30,7 +30,7 @@
 #include <net/wireless.h>
 #include <net/mac80211.h>
 
-#include "wl12xx.h"
+#include "wl1251.h"
 #include "wl1251_spi.h"
 #include "wl1251_acx.h"
 

diff --git a/drivers/net/wireless/wl12xx/wl1251_ops.h b/drivers/net/wireless/wl12xx/wl1251_ops.h
@@ -26,7 +26,7 @@
 
 #include <linux/bitops.h>
 
-#include "wl12xx.h"
+#include "wl1251.h"
 #include "wl1251_acx.h"
 
 #define WL1251_FW_NAME "wl1251-fw.bin"

diff --git a/drivers/net/wireless/wl12xx/wl1251_ps.h b/drivers/net/wireless/wl12xx/wl1251_ps.h
@@ -25,7 +25,7 @@
  *
  */
 
-#include "wl12xx.h"
+#include "wl1251.h"
 #include "wl1251_acx.h"
 
 int wl12xx_ps_set_mode(struct wl12xx *wl, enum wl12xx_cmd_ps_mode mode);

diff --git a/drivers/net/wireless/wl12xx/wl1251_rx.c b/drivers/net/wireless/wl12xx/wl1251_rx.c
@@ -25,7 +25,7 @@
 #include <linux/skbuff.h>
 #include <net/mac80211.h>
 
-#include "wl12xx.h"
+#include "wl1251.h"
 #include "reg.h"
 #include "wl1251_spi.h"
 #include "wl1251_rx.h"

diff --git a/drivers/net/wireless/wl12xx/wl1251_rx.h b/drivers/net/wireless/wl12xx/wl1251_rx.h
@@ -27,6 +27,8 @@
 
 #include <linux/bitops.h>
 
+#include "wl1251.h"
+
 /*
  * RX PATH
  *

diff --git a/drivers/net/wireless/wl12xx/wl1251_spi.c b/drivers/net/wireless/wl12xx/wl1251_spi.c
@@ -25,7 +25,7 @@
 #include <linux/crc7.h>
 #include <linux/spi/spi.h>
 
-#include "wl12xx.h"
+#include "wl1251.h"
 #include "wl12xx_80211.h"
 #include "reg.h"
 #include "wl1251_spi.h"

diff --git a/drivers/net/wireless/wl12xx/wl1251_tx.c b/drivers/net/wireless/wl12xx/wl1251_tx.c
@@ -25,7 +25,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 
-#include "wl12xx.h"
+#include "wl1251.h"
 #include "reg.h"
 #include "wl1251_spi.h"
 #include "wl1251_tx.h"
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,6 +27,8 @@ @@
     #include <linux/bitops.h>
+    #include "wl1251.h"
     /*
      * RX PATH
      *
@@ Expand Down @@