diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-21 11:17:44 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-21 11:17:44 -0700 |
commit | a1c16ed2664205dd69c0ea0ec6945f7f10d3edf9 (patch) | |
tree | 68daff891f2a1c0ef9a61b37f0ee86340d908005 /drivers/staging/brcm80211/sys | |
parent | f024c48a77c3c20d99de8f3424e8d3a061896885 (diff) | |
download | op-kernel-dev-a1c16ed2664205dd69c0ea0ec6945f7f10d3edf9.zip op-kernel-dev-a1c16ed2664205dd69c0ea0ec6945f7f10d3edf9.tar.gz |
Staging: brcm80211: remove typedefs.h
It's not needed anymore, so remove it and clean up the .h inclusion mess
a bit to get everything to build properly again.
Wow, this needs some unwinding...
Cc: Brett Rudley <brudley@broadcom.com>
Cc: Henry Ptasinski <henryp@broadcom.com>
Cc: Nohee Ko <noheek@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/brcm80211/sys')
-rw-r--r-- | drivers/staging/brcm80211/sys/wl_mac80211.c | 6 | ||||
-rw-r--r-- | drivers/staging/brcm80211/sys/wl_ucode.h | 1 | ||||
-rw-r--r-- | drivers/staging/brcm80211/sys/wl_ucode_loader.c | 3 | ||||
-rw-r--r-- | drivers/staging/brcm80211/sys/wlc_alloc.c | 5 | ||||
-rw-r--r-- | drivers/staging/brcm80211/sys/wlc_ampdu.c | 4 | ||||
-rw-r--r-- | drivers/staging/brcm80211/sys/wlc_antsel.c | 1 | ||||
-rw-r--r-- | drivers/staging/brcm80211/sys/wlc_bmac.c | 3 | ||||
-rw-r--r-- | drivers/staging/brcm80211/sys/wlc_channel.c | 7 | ||||
-rw-r--r-- | drivers/staging/brcm80211/sys/wlc_event.c | 2 | ||||
-rw-r--r-- | drivers/staging/brcm80211/sys/wlc_mac80211.c | 8 | ||||
-rw-r--r-- | drivers/staging/brcm80211/sys/wlc_phy_shim.c | 5 | ||||
-rw-r--r-- | drivers/staging/brcm80211/sys/wlc_rate.c | 5 | ||||
-rw-r--r-- | drivers/staging/brcm80211/sys/wlc_stf.c | 3 |
13 files changed, 22 insertions, 31 deletions
diff --git a/drivers/staging/brcm80211/sys/wl_mac80211.c b/drivers/staging/brcm80211/sys/wl_mac80211.c index ff9cbcc..ad635ee 100644 --- a/drivers/staging/brcm80211/sys/wl_mac80211.c +++ b/drivers/staging/brcm80211/sys/wl_mac80211.c @@ -16,13 +16,13 @@ #define __UNDEF_NO_VERSION__ -#include <typedefs.h> -#include <linuxver.h> -#include <osl.h> #include <linux/kernel.h> #include <linux/etherdevice.h> #include <linux/string.h> #include <linux/pci_ids.h> +#include <bcmdefs.h> +#include <linuxver.h> +#include <osl.h> #define WLC_MAXBSSCFG 1 /* single BSS configs */ #include <wlc_cfg.h> diff --git a/drivers/staging/brcm80211/sys/wl_ucode.h b/drivers/staging/brcm80211/sys/wl_ucode.h index 3254f5a..a1ba372 100644 --- a/drivers/staging/brcm80211/sys/wl_ucode.h +++ b/drivers/staging/brcm80211/sys/wl_ucode.h @@ -14,7 +14,6 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include <typedefs.h> typedef struct d11init { u16 addr; u16 size; diff --git a/drivers/staging/brcm80211/sys/wl_ucode_loader.c b/drivers/staging/brcm80211/sys/wl_ucode_loader.c index 93a3a01..0b41a9c 100644 --- a/drivers/staging/brcm80211/sys/wl_ucode_loader.c +++ b/drivers/staging/brcm80211/sys/wl_ucode_loader.c @@ -15,7 +15,8 @@ */ typedef struct wl_info wl_info_t; -#include <typedefs.h> +#include <linux/types.h> +#include <bcmdefs.h> #include <d11ucode_ext.h> #include <wl_ucode.h> diff --git a/drivers/staging/brcm80211/sys/wlc_alloc.c b/drivers/staging/brcm80211/sys/wlc_alloc.c index f9953df..2dc89f9 100644 --- a/drivers/staging/brcm80211/sys/wlc_alloc.c +++ b/drivers/staging/brcm80211/sys/wlc_alloc.c @@ -13,11 +13,10 @@ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ - -#include <wlc_cfg.h> -#include <typedefs.h> #include <linux/kernel.h> #include <linux/string.h> +#include <bcmdefs.h> +#include <wlc_cfg.h> #include <linuxver.h> #include <osl.h> #include <bcmutils.h> diff --git a/drivers/staging/brcm80211/sys/wlc_ampdu.c b/drivers/staging/brcm80211/sys/wlc_ampdu.c index 1edc534..a4e49f3 100644 --- a/drivers/staging/brcm80211/sys/wlc_ampdu.c +++ b/drivers/staging/brcm80211/sys/wlc_ampdu.c @@ -13,9 +13,9 @@ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ - +#include <linux/kernel.h> #include <wlc_cfg.h> -#include <typedefs.h> +#include <bcmdefs.h> #include <linuxver.h> #include <bcmdefs.h> #include <osl.h> diff --git a/drivers/staging/brcm80211/sys/wlc_antsel.c b/drivers/staging/brcm80211/sys/wlc_antsel.c index 1f5e62a..5ff8831 100644 --- a/drivers/staging/brcm80211/sys/wlc_antsel.c +++ b/drivers/staging/brcm80211/sys/wlc_antsel.c @@ -18,7 +18,6 @@ #ifdef WLANTSEL -#include <typedefs.h> #include <linux/kernel.h> #include <linuxver.h> #include <bcmdefs.h> diff --git a/drivers/staging/brcm80211/sys/wlc_bmac.c b/drivers/staging/brcm80211/sys/wlc_bmac.c index 5f386d3..b70f9d0 100644 --- a/drivers/staging/brcm80211/sys/wlc_bmac.c +++ b/drivers/staging/brcm80211/sys/wlc_bmac.c @@ -18,12 +18,11 @@ #error "This file needs WLC_LOW" #endif +#include <linux/kernel.h> #include <wlc_cfg.h> -#include <typedefs.h> #include <linuxver.h> #include <bcmdefs.h> #include <osl.h> -#include <linux/kernel.h> #include <proto/802.11.h> #include <bcmwifi.h> #include <bcmutils.h> diff --git a/drivers/staging/brcm80211/sys/wlc_channel.c b/drivers/staging/brcm80211/sys/wlc_channel.c index 259f409..5092803 100644 --- a/drivers/staging/brcm80211/sys/wlc_channel.c +++ b/drivers/staging/brcm80211/sys/wlc_channel.c @@ -14,12 +14,11 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include <wlc_cfg.h> -#include <typedefs.h> -#include <bcmdefs.h> -#include <osl.h> #include <linux/kernel.h> #include <linux/string.h> +#include <bcmdefs.h> +#include <wlc_cfg.h> +#include <osl.h> #include <linuxver.h> #include <bcmutils.h> #include <siutils.h> diff --git a/drivers/staging/brcm80211/sys/wlc_event.c b/drivers/staging/brcm80211/sys/wlc_event.c index a2fdf48..7c17e5f 100644 --- a/drivers/staging/brcm80211/sys/wlc_event.c +++ b/drivers/staging/brcm80211/sys/wlc_event.c @@ -14,8 +14,8 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include <typedefs.h> #include <linux/kernel.h> +#include <bcmdefs.h> #include <linuxver.h> #include <bcmutils.h> #include <siutils.h> diff --git a/drivers/staging/brcm80211/sys/wlc_mac80211.c b/drivers/staging/brcm80211/sys/wlc_mac80211.c index e695a48..feaffcc 100644 --- a/drivers/staging/brcm80211/sys/wlc_mac80211.c +++ b/drivers/staging/brcm80211/sys/wlc_mac80211.c @@ -13,14 +13,12 @@ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ - -#include <wlc_cfg.h> -#include <typedefs.h> #include <linux/kernel.h> -#include <linuxver.h> +#include <linux/ctype.h> #include <bcmdefs.h> +#include <wlc_cfg.h> +#include <linuxver.h> #include <osl.h> -#include <linux/ctype.h> #include <bcmutils.h> #include <bcmwifi.h> #include <siutils.h> diff --git a/drivers/staging/brcm80211/sys/wlc_phy_shim.c b/drivers/staging/brcm80211/sys/wlc_phy_shim.c index 6980935..bf8e2e1 100644 --- a/drivers/staging/brcm80211/sys/wlc_phy_shim.c +++ b/drivers/staging/brcm80211/sys/wlc_phy_shim.c @@ -21,12 +21,11 @@ * access to wlc_hw pointer. */ +#include <linux/kernel.h> +#include <bcmdefs.h> #include <wlc_cfg.h> -#include <typedefs.h> #include <linuxver.h> -#include <linux/kernel.h> #include <bcmutils.h> -#include <bcmdefs.h> #include <osl.h> #include <proto/802.11.h> diff --git a/drivers/staging/brcm80211/sys/wlc_rate.c b/drivers/staging/brcm80211/sys/wlc_rate.c index d4dcd05..d2d7256 100644 --- a/drivers/staging/brcm80211/sys/wlc_rate.c +++ b/drivers/staging/brcm80211/sys/wlc_rate.c @@ -13,11 +13,10 @@ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ - +#include <linux/kernel.h> +#include <bcmdefs.h> #include <wlc_cfg.h> -#include <typedefs.h> #include <osl.h> -#include <linux/kernel.h> #include <linuxver.h> #include <bcmutils.h> #include <siutils.h> diff --git a/drivers/staging/brcm80211/sys/wlc_stf.c b/drivers/staging/brcm80211/sys/wlc_stf.c index a1db289..4728ad9 100644 --- a/drivers/staging/brcm80211/sys/wlc_stf.c +++ b/drivers/staging/brcm80211/sys/wlc_stf.c @@ -14,9 +14,8 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include <wlc_cfg.h> -#include <typedefs.h> #include <linux/kernel.h> +#include <wlc_cfg.h> #include <linuxver.h> #include <bcmdefs.h> #include <osl.h> |