diff options
author | Brett Rudley | 2010-10-26 20:55:23 +0200 |
---|---|---|
committer | Greg Kroah-Hartman | 2010-11-10 00:34:13 +0100 |
commit | c6ac24e90a3f6a3cf25e3b1e4d8957032acf70a6 (patch) | |
tree | 6154fb8ad7e96567f8c20efb85924f1ec86419f9 /drivers/staging/brcm80211/util | |
parent | staging: brcm80211: Move #includes out of d11.h (diff) | |
download | kernel-qcow2-linux-c6ac24e90a3f6a3cf25e3b1e4d8957032acf70a6.tar.gz kernel-qcow2-linux-c6ac24e90a3f6a3cf25e3b1e4d8957032acf70a6.tar.xz kernel-qcow2-linux-c6ac24e90a3f6a3cf25e3b1e4d8957032acf70a6.zip |
staging: brcm80211: Purge linuxver.h and redistribute #includes as required
Linuxver.h only included other .h files. Delete it and move #includes to .c's as needed.
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/brcm80211/util')
-rw-r--r-- | drivers/staging/brcm80211/util/aiutils.c | 6 | ||||
-rw-r--r-- | drivers/staging/brcm80211/util/bcmotp.c | 3 | ||||
-rw-r--r-- | drivers/staging/brcm80211/util/bcmsrom.c | 3 | ||||
-rw-r--r-- | drivers/staging/brcm80211/util/bcmutils.c | 5 | ||||
-rw-r--r-- | drivers/staging/brcm80211/util/bcmwifi.c | 3 | ||||
-rw-r--r-- | drivers/staging/brcm80211/util/hnddma.c | 3 | ||||
-rw-r--r-- | drivers/staging/brcm80211/util/hndpmu.c | 6 | ||||
-rw-r--r-- | drivers/staging/brcm80211/util/linux_osl.c | 5 | ||||
-rw-r--r-- | drivers/staging/brcm80211/util/nicpci.c | 2 | ||||
-rw-r--r-- | drivers/staging/brcm80211/util/sbutils.c | 3 | ||||
-rw-r--r-- | drivers/staging/brcm80211/util/siutils.c | 6 |
11 files changed, 35 insertions, 10 deletions
diff --git a/drivers/staging/brcm80211/util/aiutils.c b/drivers/staging/brcm80211/util/aiutils.c index 75a7e3a5c009..1d4e3729ad61 100644 --- a/drivers/staging/brcm80211/util/aiutils.c +++ b/drivers/staging/brcm80211/util/aiutils.c @@ -17,8 +17,12 @@ #include <linux/kernel.h> #include <linux/string.h> #include <bcmdefs.h> +#ifdef BRCM_FULLMAC +#include <linux/netdevice.h> +#endif #include <osl.h> -#include <linuxver.h> +#include <linux/module.h> +#include <linux/pci.h> #include <bcmutils.h> #include <siutils.h> #include <hndsoc.h> diff --git a/drivers/staging/brcm80211/util/bcmotp.c b/drivers/staging/brcm80211/util/bcmotp.c index c909832c7ee1..9b1e6d961a72 100644 --- a/drivers/staging/brcm80211/util/bcmotp.c +++ b/drivers/staging/brcm80211/util/bcmotp.c @@ -18,7 +18,8 @@ #include <linux/string.h> #include <bcmdefs.h> #include <osl.h> -#include <linuxver.h> +#include <linux/module.h> +#include <linux/pci.h> #include <bcmdevs.h> #include <bcmutils.h> #include <siutils.h> diff --git a/drivers/staging/brcm80211/util/bcmsrom.c b/drivers/staging/brcm80211/util/bcmsrom.c index 1282ef7eb922..4f3d3ca1af79 100644 --- a/drivers/staging/brcm80211/util/bcmsrom.c +++ b/drivers/staging/brcm80211/util/bcmsrom.c @@ -17,7 +17,8 @@ #include <linux/string.h> #include <bcmdefs.h> #include <osl.h> -#include <linuxver.h> +#include <linux/module.h> +#include <linux/pci.h> #include <stdarg.h> #include <bcmutils.h> #include <hndsoc.h> diff --git a/drivers/staging/brcm80211/util/bcmutils.c b/drivers/staging/brcm80211/util/bcmutils.c index 9789ea45ecd6..869d34c420d2 100644 --- a/drivers/staging/brcm80211/util/bcmutils.c +++ b/drivers/staging/brcm80211/util/bcmutils.c @@ -19,8 +19,10 @@ #include <linux/string.h> #include <bcmdefs.h> #include <stdarg.h> +#include <linux/module.h> +#include <linux/pci.h> +#include <linux/netdevice.h> #include <osl.h> -#include <linuxver.h> #include <bcmutils.h> #include <siutils.h> #include <bcmnvram.h> @@ -30,7 +32,6 @@ #include <proto/802.1d.h> #include <proto/802.11.h> - /* copy a buffer into a pkt buffer chain */ uint pktfrombuf(osl_t *osh, void *p, uint offset, int len, unsigned char *buf) { diff --git a/drivers/staging/brcm80211/util/bcmwifi.c b/drivers/staging/brcm80211/util/bcmwifi.c index 1bb6c78eece7..2e472e00adc3 100644 --- a/drivers/staging/brcm80211/util/bcmwifi.c +++ b/drivers/staging/brcm80211/util/bcmwifi.c @@ -15,6 +15,9 @@ */ #include <linux/ctype.h> #include <linux/kernel.h> +#ifdef BRCM_FULLMAC +#include <linux/netdevice.h> +#endif #include <bcmdefs.h> #include <bcmutils.h> #include <bcmwifi.h> diff --git a/drivers/staging/brcm80211/util/hnddma.c b/drivers/staging/brcm80211/util/hnddma.c index fe503e7de563..b4dcb05705b3 100644 --- a/drivers/staging/brcm80211/util/hnddma.c +++ b/drivers/staging/brcm80211/util/hnddma.c @@ -16,7 +16,8 @@ #include <linux/kernel.h> #include <linux/string.h> -#include <linuxver.h> +#include <linux/netdevice.h> +#include <linux/pci.h> #include <bcmdefs.h> #include <bcmdevs.h> #include <osl.h> diff --git a/drivers/staging/brcm80211/util/hndpmu.c b/drivers/staging/brcm80211/util/hndpmu.c index a8f3306c1d2b..6fb256bc5549 100644 --- a/drivers/staging/brcm80211/util/hndpmu.c +++ b/drivers/staging/brcm80211/util/hndpmu.c @@ -15,7 +15,11 @@ */ #include <linux/kernel.h> #include <linux/string.h> -#include <linuxver.h> +#include <linux/module.h> +#include <linux/pci.h> +#ifdef BRCM_FULLMAC +#include <linux/netdevice.h> +#endif #include <bcmdefs.h> #include <osl.h> #include <bcmutils.h> diff --git a/drivers/staging/brcm80211/util/linux_osl.c b/drivers/staging/brcm80211/util/linux_osl.c index 2bb5b8722df6..effe043f1962 100644 --- a/drivers/staging/brcm80211/util/linux_osl.c +++ b/drivers/staging/brcm80211/util/linux_osl.c @@ -20,7 +20,10 @@ #include <asm/paccess.h> #endif /* mips */ #include <bcmendian.h> -#include <linuxver.h> +#include <linux/module.h> +#include <linux/pci.h> +#include <linux/netdevice.h> +#include <linux/sched.h> #include <bcmdefs.h> #include <osl.h> #include <bcmutils.h> diff --git a/drivers/staging/brcm80211/util/nicpci.c b/drivers/staging/brcm80211/util/nicpci.c index 23f86dd7b159..169a4287ee63 100644 --- a/drivers/staging/brcm80211/util/nicpci.c +++ b/drivers/staging/brcm80211/util/nicpci.c @@ -15,7 +15,7 @@ */ #include <linux/string.h> -#include <linuxver.h> +#include <linux/pci.h> #include <bcmdefs.h> #include <osl.h> #include <bcmutils.h> diff --git a/drivers/staging/brcm80211/util/sbutils.c b/drivers/staging/brcm80211/util/sbutils.c index e4c0baba553d..82767e266e97 100644 --- a/drivers/staging/brcm80211/util/sbutils.c +++ b/drivers/staging/brcm80211/util/sbutils.c @@ -16,6 +16,9 @@ #include <linux/types.h> #include <bcmdefs.h> +#ifdef BRCM_FULLMAC +#include <linux/netdevice.h> +#endif #include <osl.h> #include <bcmutils.h> #include <siutils.h> diff --git a/drivers/staging/brcm80211/util/siutils.c b/drivers/staging/brcm80211/util/siutils.c index f3ea7e1a7aef..3b99293307ea 100644 --- a/drivers/staging/brcm80211/util/siutils.c +++ b/drivers/staging/brcm80211/util/siutils.c @@ -17,8 +17,12 @@ #include <linux/kernel.h> #include <linux/string.h> #include <bcmdefs.h> +#ifdef BRCM_FULLMAC +#include <linux/netdevice.h> +#endif #include <osl.h> -#include <linuxver.h> +#include <linux/module.h> +#include <linux/pci.h> #include <bcmutils.h> #include <siutils.h> #include <bcmdevs.h> |