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/brcmfmac | |
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/brcmfmac')
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/bcmsdh.c | 3 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c | 1 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 4 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c | 7 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/dhd_cdc.c | 3 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/dhd_common.c | 4 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c | 1 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/dhd_linux.c | 8 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/dhd_sdio.c | 3 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c | 6 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h | 5 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/wl_iw.c | 7 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/wl_iw.h | 1 |
13 files changed, 23 insertions, 30 deletions
diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh.c index 6b62478..4c613da 100644 --- a/drivers/staging/brcm80211/brcmfmac/bcmsdh.c +++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh.c @@ -15,7 +15,8 @@ */ /* ****************** BCMSDH Interface Functions *************************** */ -#include <typedefs.h> +#include <linux/types.h> +#include <bcmdefs.h> #include <bcmdevs.h> #include <bcmendian.h> #include <bcmutils.h> diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c index e7ad60d..9028cd0 100644 --- a/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c +++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c @@ -20,7 +20,6 @@ #define __UNDEF_NO_VERSION__ -#include <typedefs.h> #include <linuxver.h> #include <linux/pci.h> diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c index 9adf37a..f6c9c45 100644 --- a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c +++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c @@ -13,8 +13,8 @@ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include <typedefs.h> - +#include <linux/types.h> +#include <bcmdefs.h> #include <bcmdevs.h> #include <bcmendian.h> #include <bcmutils.h> diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c index 6ee2f48..ae7b566 100644 --- a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c +++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c @@ -13,15 +13,14 @@ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ - -#include <typedefs.h> +#include <linux/types.h> +#include <linux/sched.h> /* request_irq() */ +#include <bcmdefs.h> #include <bcmutils.h> #include <sdio.h> /* SDIO Specs */ #include <bcmsdbus.h> /* bcmsdh to/from specific controller APIs */ #include <sdiovar.h> /* to get msglevel bit values */ -#include <linux/sched.h> /* request_irq() */ - #include <linux/mmc/core.h> #include <linux/mmc/card.h> #include <linux/mmc/sdio_func.h> diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_cdc.c b/drivers/staging/brcm80211/brcmfmac/dhd_cdc.c index 08aca652..bcbaac9 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd_cdc.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_cdc.c @@ -14,7 +14,8 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include <typedefs.h> +#include <linux/types.h> +#include <bcmdefs.h> #include <osl.h> #include <bcmutils.h> diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_common.c b/drivers/staging/brcm80211/brcmfmac/dhd_common.c index 41063f9..703188f 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd_common.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_common.c @@ -13,10 +13,10 @@ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include <typedefs.h> -#include <osl.h> #include <linux/kernel.h> #include <linux/string.h> +#include <bcmdefs.h> +#include <osl.h> #include <bcmutils.h> #include <bcmendian.h> #include <dngl_stats.h> diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c b/drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c index b200ee77..f647034 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c @@ -14,7 +14,6 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include <typedefs.h> #include <linuxver.h> #include <osl.h> #include <bcmutils.h> diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c index a3e9ca8..e2bc13d 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c @@ -17,10 +17,6 @@ #ifdef CONFIG_WIFI_CONTROL_FUNC #include <linux/platform_device.h> #endif -#include <typedefs.h> -#include <linuxver.h> -#include <osl.h> - #include <linux/init.h> #include <linux/kernel.h> #include <linux/kthread.h> @@ -34,8 +30,10 @@ #include <linux/ethtool.h> #include <linux/fcntl.h> #include <linux/fs.h> - #include <linux/uaccess.h> +#include <bcmdefs.h> +#include <linuxver.h> +#include <osl.h> #include <bcmutils.h> #include <bcmendian.h> diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c index fd4c91e..b2281d9 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c @@ -14,7 +14,8 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include <typedefs.h> +#include <linux/types.h> +#include <bcmdefs.h> #include <osl.h> #include <bcmsdh.h> diff --git a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c index 621521b..9664787a 100644 --- a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c +++ b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c @@ -14,16 +14,15 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include <typedefs.h> +#include <linux/kernel.h> +#include <linux/if_arp.h> #include <linuxver.h> #include <osl.h> -#include <linux/kernel.h> #include <bcmutils.h> #include <bcmendian.h> #include <proto/ethernet.h> -#include <linux/if_arp.h> #include <asm/uaccess.h> #include <dngl_stats.h> @@ -35,7 +34,6 @@ #include <dngl_stats.h> #include <dhd.h> -#include <linux/kernel.h> #include <linux/kthread.h> #include <linux/netdevice.h> #include <linux/sched.h> diff --git a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h index 34eff08..770e63f 100644 --- a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h +++ b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h @@ -18,11 +18,10 @@ #define _wl_cfg80211_h_ #include <linux/wireless.h> -#include <typedefs.h> -#include <proto/ethernet.h> -#include <wlioctl.h> #include <linux/wireless.h> #include <net/cfg80211.h> +#include <proto/ethernet.h> +#include <wlioctl.h> struct wl_conf; struct wl_iface; diff --git a/drivers/staging/brcm80211/brcmfmac/wl_iw.c b/drivers/staging/brcm80211/brcmfmac/wl_iw.c index d6196d5..979a494 100644 --- a/drivers/staging/brcm80211/brcmfmac/wl_iw.c +++ b/drivers/staging/brcm80211/brcmfmac/wl_iw.c @@ -14,12 +14,11 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include <wlioctl.h> - -#include <typedefs.h> -#include <linuxver.h> #include <linux/kthread.h> +#include <bcmdefs.h> +#include <linuxver.h> #include <osl.h> +#include <wlioctl.h> #include <bcmutils.h> #include <bcmendian.h> diff --git a/drivers/staging/brcm80211/brcmfmac/wl_iw.h b/drivers/staging/brcm80211/brcmfmac/wl_iw.h index e8e9144..edbf61f 100644 --- a/drivers/staging/brcm80211/brcmfmac/wl_iw.h +++ b/drivers/staging/brcm80211/brcmfmac/wl_iw.h @@ -19,7 +19,6 @@ #include <linux/wireless.h> -#include <typedefs.h> #include <proto/ethernet.h> #include <wlioctl.h> |