Browse Source

staging: brcm80211: Move #include from bcmutils.h out to .c files

Part of effort to move #includes out of .h files and unwind the include mess.

Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Brett Rudley 14 years ago
parent
commit
7f7c3dbb3f

+ 1 - 1
drivers/staging/brcm80211/brcmfmac/bcmsdh.c

@@ -20,10 +20,10 @@
 #include <bcmdefs.h>
 #include <bcmdevs.h>
 #include <bcmendian.h>
+#include <osl.h>
 #include <bcmutils.h>
 #include <hndsoc.h>
 #include <siutils.h>
-#include <osl.h>
 
 #include <bcmsdh.h>		/* BRCM API for SDIO
 			 clients (such as wl, dhd) */

+ 1 - 1
drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c

@@ -18,8 +18,8 @@
 #include <bcmdefs.h>
 #include <bcmdevs.h>
 #include <bcmendian.h>
-#include <bcmutils.h>
 #include <osl.h>
+#include <bcmutils.h>
 #include <sdio.h>		/* SDIO Device and Protocol Specs */
 #include <sdioh.h>		/* SDIO Host Controller Specification */
 #include <bcmsdbus.h>		/* bcmsdh to/from specific controller APIs */

+ 1 - 0
drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c

@@ -17,6 +17,7 @@
 #include <linux/sched.h>	/* request_irq() */
 #include <linux/netdevice.h>
 #include <bcmdefs.h>
+#include <osl.h>
 #include <bcmutils.h>
 #include <sdio.h>		/* SDIO Specs */
 #include <bcmsdbus.h>		/* bcmsdh to/from specific controller APIs */

+ 0 - 1
drivers/staging/brcm80211/include/bcmutils.h

@@ -30,7 +30,6 @@
 	};
 
 /* ** driver-only section ** */
-#include <osl.h>
 
 #define GPIO_PIN_NOTDEFINED 	0x20	/* Pin not defined */
 

+ 1 - 0
drivers/staging/brcm80211/phy/wlc_phytbl_lcn.c

@@ -17,6 +17,7 @@
 #include <linux/types.h>
 #include <sbhndpio.h>
 #include <sbhnddma.h>
+#include <osl.h>
 #include <wlc_phy_int.h>
 #include <wlc_phytbl_lcn.h>
 

+ 1 - 0
drivers/staging/brcm80211/phy/wlc_phytbl_n.c

@@ -18,6 +18,7 @@
 
 #include <sbhndpio.h>
 #include <sbhnddma.h>
+#include <osl.h>
 #include <wlc_phy_int.h>
 #include <wlc_phytbl_n.h>
 

+ 1 - 0
drivers/staging/brcm80211/sys/wlc_event.c

@@ -18,6 +18,7 @@
 #include <bcmdefs.h>
 #include <linux/module.h>
 #include <linux/pci.h>
+#include <osl.h>
 #include <bcmutils.h>
 #include <siutils.h>
 #include <sbhndpio.h>

+ 1 - 1
drivers/staging/brcm80211/sys/wlc_phy_shim.c

@@ -26,8 +26,8 @@
 #include <wlc_cfg.h>
 #include <linux/module.h>
 #include <linux/pci.h>
-#include <bcmutils.h>
 #include <osl.h>
+#include <bcmutils.h>
 
 #include <proto/802.11.h>
 #include <bcmwifi.h>

+ 1 - 0
drivers/staging/brcm80211/util/bcmwifi.c

@@ -18,6 +18,7 @@
 #ifdef BRCM_FULLMAC
 #include <linux/netdevice.h>
 #endif
+#include <osl.h>
 #include <bcmdefs.h>
 #include <bcmutils.h>
 #include <bcmwifi.h>