diff options
| author | Roland Vossen <rvossen@broadcom.com> | 2011-06-09 16:44:50 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-06-28 13:02:40 -0700 |
| commit | c4daa849f3bf2b80cf16042311ca3377f145ca24 (patch) | |
| tree | 16cfa62e91ac26aef880f29fd8b839d619ad2500 /drivers/staging/brcm80211/brcmsmac | |
| parent | af34b024e28ebef7d4a5b58de3f07936f50466e9 (diff) | |
staging: brcm80211: fixed double #include problem
Code cleanup. Removed one redundant include and reshuffled #include order as
to include Linux header files first.
Reported-by: julie Sullivan <kernelmail.jms@gmail.com>
Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/brcm80211/brcmsmac')
| -rw-r--r-- | drivers/staging/brcm80211/brcmsmac/bmac.c | 2 | ||||
| -rw-r--r-- | drivers/staging/brcm80211/brcmsmac/dma.c | 8 | ||||
| -rw-r--r-- | drivers/staging/brcm80211/brcmsmac/otp.c | 2 | ||||
| -rw-r--r-- | drivers/staging/brcm80211/brcmsmac/stf.c | 1 |
4 files changed, 6 insertions, 7 deletions
diff --git a/drivers/staging/brcm80211/brcmsmac/bmac.c b/drivers/staging/brcm80211/brcmsmac/bmac.c index 448a5625a336..9d6ee5dbad06 100644 --- a/drivers/staging/brcm80211/brcmsmac/bmac.c +++ b/drivers/staging/brcm80211/brcmsmac/bmac.c @@ -16,10 +16,10 @@ #include <linux/pci.h> #include <net/mac80211.h> -#include "types.h" #include <brcm_hw_ids.h> #include <aiutils.h> #include <chipcommon.h> +#include "types.h" #include "rate.h" #include "phy/phy_hal.h" #include "channel.h" diff --git a/drivers/staging/brcm80211/brcmsmac/dma.c b/drivers/staging/brcm80211/brcmsmac/dma.c index 642c992122a0..adf364ca5daa 100644 --- a/drivers/staging/brcm80211/brcmsmac/dma.c +++ b/drivers/staging/brcm80211/brcmsmac/dma.c @@ -18,15 +18,15 @@ #include <linux/delay.h> #include <linux/pci.h> +#if defined(__mips__) +#include <asm/addrspace.h> +#endif + #include <brcmu_utils.h> #include <aiutils.h> #include "types.h" #include "dma.h" -#if defined(__mips__) -#include <asm/addrspace.h> -#endif - /* * Each descriptor ring must be 8kB aligned, and fit within a contiguous 8kB physical address. */ diff --git a/drivers/staging/brcm80211/brcmsmac/otp.c b/drivers/staging/brcm80211/brcmsmac/otp.c index d09f9137db9b..2cda60f83d8f 100644 --- a/drivers/staging/brcm80211/brcmsmac/otp.c +++ b/drivers/staging/brcm80211/brcmsmac/otp.c @@ -18,8 +18,8 @@ #include <linux/errno.h> #include <brcm_hw_ids.h> -#include "aiutils.h" #include <chipcommon.h> +#include "aiutils.h" #include "otp.h" #define OTPS_GUP_MASK 0x00000f00 diff --git a/drivers/staging/brcm80211/brcmsmac/stf.c b/drivers/staging/brcm80211/brcmsmac/stf.c index 625252aeb0bf..3a264ec1b37d 100644 --- a/drivers/staging/brcm80211/brcmsmac/stf.c +++ b/drivers/staging/brcm80211/brcmsmac/stf.c @@ -17,7 +17,6 @@ #include <net/mac80211.h> #include "types.h" - #include "d11.h" #include "rate.h" #include "phy/phy_hal.h" |