Staging: brcm80211: remove typedefs.h
authorGreg Kroah-Hartman <gregkh@suse.de>
Thu, 21 Oct 2010 18:17:44 +0000 (11:17 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 21 Oct 2010 18:17:44 +0000 (11:17 -0700)
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>
69 files changed:
drivers/staging/brcm80211/brcmfmac/bcmsdh.c
drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c
drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c
drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c
drivers/staging/brcm80211/brcmfmac/dhd_cdc.c
drivers/staging/brcm80211/brcmfmac/dhd_common.c
drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c
drivers/staging/brcm80211/brcmfmac/dhd_linux.c
drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h
drivers/staging/brcm80211/brcmfmac/wl_iw.c
drivers/staging/brcm80211/brcmfmac/wl_iw.h
drivers/staging/brcm80211/include/bcm_rpc.h
drivers/staging/brcm80211/include/bcmdefs.h
drivers/staging/brcm80211/include/bcmendian.h
drivers/staging/brcm80211/include/bcmnvram.h
drivers/staging/brcm80211/include/d11.h
drivers/staging/brcm80211/include/dbus.h
drivers/staging/brcm80211/include/dhdioctl.h
drivers/staging/brcm80211/include/hndrte_armtrap.h
drivers/staging/brcm80211/include/hndrte_cons.h
drivers/staging/brcm80211/include/linux_osl.h
drivers/staging/brcm80211/include/msgtrace.h
drivers/staging/brcm80211/include/proto/802.11.h
drivers/staging/brcm80211/include/proto/bcmeth.h
drivers/staging/brcm80211/include/proto/bcmevent.h
drivers/staging/brcm80211/include/proto/bcmip.h
drivers/staging/brcm80211/include/proto/ethernet.h
drivers/staging/brcm80211/include/proto/vlan.h
drivers/staging/brcm80211/include/proto/wpa.h
drivers/staging/brcm80211/include/qmath.h
drivers/staging/brcm80211/include/sdiovar.h
drivers/staging/brcm80211/include/typedefs.h [deleted file]
drivers/staging/brcm80211/include/wlioctl.h
drivers/staging/brcm80211/phy/wlc_phy_cmn.c
drivers/staging/brcm80211/phy/wlc_phy_hal.h
drivers/staging/brcm80211/phy/wlc_phy_int.h
drivers/staging/brcm80211/phy/wlc_phy_lcn.c
drivers/staging/brcm80211/phy/wlc_phy_lcn.h
drivers/staging/brcm80211/phy/wlc_phy_n.c
drivers/staging/brcm80211/phy/wlc_phytbl_lcn.c
drivers/staging/brcm80211/phy/wlc_phytbl_n.c
drivers/staging/brcm80211/sys/wl_mac80211.c
drivers/staging/brcm80211/sys/wl_ucode.h
drivers/staging/brcm80211/sys/wl_ucode_loader.c
drivers/staging/brcm80211/sys/wlc_alloc.c
drivers/staging/brcm80211/sys/wlc_ampdu.c
drivers/staging/brcm80211/sys/wlc_antsel.c
drivers/staging/brcm80211/sys/wlc_bmac.c
drivers/staging/brcm80211/sys/wlc_channel.c
drivers/staging/brcm80211/sys/wlc_event.c
drivers/staging/brcm80211/sys/wlc_mac80211.c
drivers/staging/brcm80211/sys/wlc_phy_shim.c
drivers/staging/brcm80211/sys/wlc_rate.c
drivers/staging/brcm80211/sys/wlc_stf.c
drivers/staging/brcm80211/util/aiutils.c
drivers/staging/brcm80211/util/bcmotp.c
drivers/staging/brcm80211/util/bcmsrom.c
drivers/staging/brcm80211/util/bcmutils.c
drivers/staging/brcm80211/util/bcmwifi.c
drivers/staging/brcm80211/util/hnddma.c
drivers/staging/brcm80211/util/hndpmu.c
drivers/staging/brcm80211/util/linux_osl.c
drivers/staging/brcm80211/util/nicpci.c
drivers/staging/brcm80211/util/nvram/nvram_ro.c
drivers/staging/brcm80211/util/qmath.c
drivers/staging/brcm80211/util/sbutils.c
drivers/staging/brcm80211/util/siutils.c

index 6b62478d998d67be560a33f60b0aabfba60ad9f7..4c613da3553ab11824bdd02cdb54fa1422fcc1de 100644 (file)
@@ -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>
index e7ad60d98affc01fbfe4fa20ff6214e9b3d04fee..9028cd01d9d03fdfdbf1feb6248d02b2d8c57197 100644 (file)
@@ -20,7 +20,6 @@
 
 #define __UNDEF_NO_VERSION__
 
-#include <typedefs.h>
 #include <linuxver.h>
 
 #include <linux/pci.h>
index 9adf37a2f33f49960c60a31d5447865104c864d5..f6c9c454181328b139e419b3f9110ed838341b11 100644 (file)
@@ -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>
index 6ee2f4862de8c54c96ffe4a7210303c391fe78dd..ae7b566b11d70227ddb323002306e44b52fb4bf9 100644 (file)
  * 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>
index 08aca6521f78a9d034b18e86f2ce7494a450d1c2..bcbaac9bcdcc8af209b28a10463dd2710679efdb 100644 (file)
@@ -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>
index 41063f9f36e5d5da97b310517a57790d0bebea25..703188fc28ec9f26a87b6aeed82ac6d5f720580b 100644 (file)
  * 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>
index b200ee77593a1836b1a6f4d398ba52758f527769..f647034f36d689348024a48d4e0daf673fc416f4 100644 (file)
@@ -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>
index a3e9ca8e6e8843279cb067da499112bfd386071f..e2bc13d66c71ee66635a4732c2a0316995e5a836 100644 (file)
 #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>
 #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>
 
index fd4c91ee3ca461adda337e762a68e838b12f90c8..b2281d9dfdcfa2d09afbc9052f548ef433cf0a74 100644 (file)
@@ -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>
 
index 621521b9e408bfa1d64a6044535ab6a46610be8f..9664787a9a57a8a72420ed5dd4556154507a9c33 100644 (file)
  * 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>
index 34eff08aaa670809c7f818455de1fbefdc2b71ca..770e63f0c8efd2bdc27d3b51ad36d9e737abceb5 100644 (file)
 #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;
index d6196d5cd23497046cb3aeae79a31866e20d296d..979a494fda59eaff5b23c5464bff79cd07096b07 100644 (file)
  * 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>
index e8e91442d9655117567d5a92b5b8b08158eb414c..edbf61f30b471f93a67a9d61eea5ff9c66f9fa4a 100644 (file)
@@ -19,7 +19,6 @@
 
 #include <linux/wireless.h>
 
-#include <typedefs.h>
 #include <proto/ethernet.h>
 #include <wlioctl.h>
 
index e1f3cfd77cdad75d209110da1b30737666e5ba6c..77e5d8f71966896084a2ca29a13987a662aa1494 100644 (file)
@@ -17,7 +17,6 @@
 #ifndef _BCM_RPC_H_
 #define _BCM_RPC_H_
 
-#include <typedefs.h>
 #include <rpc_osl.h>
 
 typedef struct rpc_info rpc_info_t;
index 2e1f35386f1885a2162dec9c5d04eab1eb201daa..dc52e9dbb8b5ac2178c7a869b4ff7e7fba42b15e 100644 (file)
 #define JTAG_BUS               4
 #define USB_BUS                        5
 #define SPI_BUS                        6
-/*
- * One doesn't need to include this file explicitly, gets included automatically if
- * typedefs.h is included.
- */
+
+
+#ifndef OFF
+#define        OFF     0
+#endif
+
+#ifndef ON
+#define        ON      1               /* ON = 1 */
+#endif
+
+#define        AUTO    (-1)            /* Auto = -1 */
 
 #ifdef mips
 #define BCMFASTPATH            __attribute__ ((__section__(".text.fastpath")))
index 52296fb9fc589126be9dbc38a7f25f3d346050d8..4123aefa211c8e944b902fc82eca6bd31da182f6 100644 (file)
@@ -17,8 +17,6 @@
 #ifndef _BCMENDIAN_H_
 #define _BCMENDIAN_H_
 
-#include <typedefs.h>
-
 /* Reverse the bytes in a 16-bit value */
 #define BCMSWAP16(val) \
        ((u16)((((u16)(val) & (u16)0x00ffU) << 8) | \
index adb2eb766c3fed21b9d3a82d520ea89d7957b2d2..63e31a4749c3f170ff1c4100a821d21afc2e2dce 100644 (file)
@@ -19,7 +19,6 @@
 
 #ifndef _LANGUAGE_ASSEMBLY
 
-#include <typedefs.h>
 #include <bcmdefs.h>
 
 struct nvram_header {
index 5789e0828ebbb31a1d5de5a1219ad3dd8a361924..c07548c70e307dde7d891e68baaa9ef30abfe23d 100644 (file)
@@ -17,7 +17,7 @@
 #ifndef        _D11_H
 #define        _D11_H
 
-#include <typedefs.h>
+#include <bcmdefs.h>
 #include <bcmdevs.h>
 #include <hndsoc.h>
 #include <sbhndpio.h>
index 52666632470ec3b9483039ade8d089ef129694f7..81ffea79d00895990661afa20af2ba05263b5cef 100644 (file)
@@ -17,8 +17,6 @@
 #ifndef __DBUS_H__
 #define __DBUS_H__
 
-#include "typedefs.h"
-
 #ifdef BCMDBG
 #define DBUSERR(args)        do { if (net_ratelimit()) printf args; } while (0)
 #define DBUSTRACE(args)
index 78fd02de1376f26c1d74e705accf19c167bca4d2..4d06e506f154f03126b6bf4bea7f1778272cc812 100644 (file)
@@ -17,8 +17,6 @@
 #ifndef _dhdioctl_h_
 #define        _dhdioctl_h_
 
-#include <typedefs.h>
-
 /* require default structure packing */
 #define BWL_DEFAULT_PACKING
 #include <packed_section_start.h>
index 8dc636d2ad6eb9558abc35b67f8553da261a51b4..28f092c9e027a97eac880ed2dcf9bbcfed72f02b 100644 (file)
@@ -47,8 +47,6 @@
 
 #ifndef        _LANGUAGE_ASSEMBLY
 
-#include <typedefs.h>
-
 typedef struct _trap_struct {
        u32 type;
        u32 epc;
index 9e8442f5034064332d54bfaeb548061253abcf31..5caa53fb65522e68da17cced18ab7444b523982f 100644 (file)
@@ -14,8 +14,6 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <typedefs.h>
-
 #define CBUF_LEN       (128)
 
 #define LOG_BUF_LEN    1024
index 7edf47f20a9eaf23d9af842a6851bc1fe03e6ac1..c9c860b6e474f87c9cdfa23dc6bab67c16e79685 100644 (file)
@@ -17,9 +17,6 @@
 #ifndef _linux_osl_h_
 #define _linux_osl_h_
 
-#ifdef BRCM_FULLMAC
-#include <typedefs.h>
-#endif
 
 /* Linux Kernel: File Operations: start */
 extern void *osl_os_open_image(char *filename);
index 25b16615543e8832fa79dab69be10bb1dec55133..9d9e53da088a5d08dc91dad4acd9c666eff23512 100644 (file)
@@ -17,8 +17,6 @@
 #ifndef        _MSGTRACE_H
 #define        _MSGTRACE_H
 
-#include <typedefs.h>
-
 /* This marks the start of a packed structure section. */
 #include <packed_section_start.h>
 
index db26cf1066206ee3a52817da09459cf7dfb1cf1d..ffde19c5ac5c312665fc4e3f293d54ce057babfd 100644 (file)
@@ -17,7 +17,6 @@
 #ifndef _802_11_H_
 #define _802_11_H_
 
-#include <typedefs.h>
 #include <proto/wpa.h>
 #include <packed_section_start.h>
 
index c5da92b9ccd452c52ee8095c0981d028ccdb15db..f7d3d8dfd3ae4bad10e605ac79e9c4b142baf8a6 100644 (file)
@@ -17,7 +17,6 @@
 #ifndef _BCMETH_H_
 #define _BCMETH_H_
 
-#include <typedefs.h>
 #include <packed_section_start.h>
 
 #define        BCMILCP_SUBTYPE_RATE            1
index 0a7231df0ceab92eefb92807b5075e1d90dc981e..865d15767a006a3faa60fe006a582c675cad9932 100644 (file)
@@ -17,7 +17,6 @@
 #ifndef _BCMEVENT_H_
 #define _BCMEVENT_H_
 
-#include <typedefs.h>
 #include <packed_section_start.h>
 
 #define BCM_EVENT_MSG_VERSION          1
index 37ff7188d94167d4bf41a9ce52b2bca803a652cd..1ac391a405273152d2e7b5ed37a9da82c6ce53e2 100644 (file)
@@ -17,7 +17,6 @@
 #ifndef _bcmip_h_
 #define _bcmip_h_
 
-#include <typedefs.h>
 #include <packed_section_start.h>
 
 #define IP_VER_OFFSET          0x0
index d208d5f606a707fcf06b09381b2961dac56c6e1e..cc17b428dd3ff64b6461931e7af1ddbba5d02804 100644 (file)
@@ -17,7 +17,6 @@
 #ifndef _NET_ETHERNET_H_
 #define _NET_ETHERNET_H_
 
-#include "typedefs.h"
 #include <packed_section_start.h>
 
 #define        ETHER_ADDR_LEN          6
index 9e1f17836ae36405ce899b1a9f9137cfbb56503e..f8b4ce257e7b81790fa63a43438e238b36d67a79 100644 (file)
@@ -17,7 +17,6 @@
 #ifndef _vlan_h_
 #define _vlan_h_
 
-#include <typedefs.h>
 #include <packed_section_start.h>
 
 #define VLAN_VID_MASK          0xfff
index 5c63e593e6cb266bdf3548c775284687089e04f1..ec84c9f2b5eecd160ed5a05752c24f111a51648e 100644 (file)
@@ -17,7 +17,6 @@
 #ifndef _proto_wpa_h_
 #define _proto_wpa_h_
 
-#include <typedefs.h>
 #include <proto/ethernet.h>
 
 #include <packed_section_start.h>
index 4002eb06acaa5eb0b0a3dd14f0d23688d62c7034..5f525dbcd46e9a75f7e99bd0ba4d707fbc8ec33e 100644 (file)
@@ -17,8 +17,6 @@
 #ifndef __QMATH_H__
 #define __QMATH_H__
 
-#include <typedefs.h>
-
 s16 qm_sat32(s32 op);
 
 s32 qm_mul321616(s16 op1, s16 op2);
index 2112cb6f901beb6dc90e6f11fc372b25737138b0..7686fde0396057d6db3fb7b2992b2b884960de24 100644 (file)
@@ -17,8 +17,6 @@
 #ifndef _sdiovar_h_
 #define _sdiovar_h_
 
-#include <typedefs.h>
-
 /* require default structure packing */
 #define BWL_DEFAULT_PACKING
 #include <packed_section_start.h>
diff --git a/drivers/staging/brcm80211/include/typedefs.h b/drivers/staging/brcm80211/include/typedefs.h
deleted file mode 100644 (file)
index 266734a..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2010 Broadcom Corporation
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef _TYPEDEFS_H_
-#define _TYPEDEFS_H_
-
-#include <linux/types.h>
-
-#ifndef OFF
-#define        OFF     0
-#endif
-
-#ifndef ON
-#define        ON      1               /* ON = 1 */
-#endif
-
-#define        AUTO    (-1)            /* Auto = -1 */
-
-
-/*
- * Including the bcmdefs.h here, to make sure everyone including typedefs.h
- * gets this automatically
-*/
-#include <bcmdefs.h>
-
-#endif                         /* _TYPEDEFS_H_ */
index 0b81807c2f98b0526b93fb50558a0527ea6cc720..96866fb8898cef05988606931566e80bef51bbb9 100644 (file)
@@ -17,7 +17,6 @@
 #ifndef _wlioctl_h_
 #define        _wlioctl_h_
 
-#include <typedefs.h>
 #include <proto/ethernet.h>
 #ifdef BRCM_FULLMAC
 #include <proto/bcmeth.h>
index 21bb8f10fc106eae6fd2f3ebe1bbded22102c39e..8287261120f4993eaaafe8c2c7d19e092e3f6006 100644 (file)
 
 #include <wlc_cfg.h>
 
-#include <typedefs.h>
-#include <osl.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <bcmdefs.h>
+#include <osl.h>
 #include <linuxver.h>
 #include <bcmendian.h>
 #include <bcmnvram.h>
index 6ad1b824a72ee25379ccb6c3993092bf07b61caf..52260b2d0eba454ef40ff1ebceb0f281e4212efb 100644 (file)
@@ -17,7 +17,6 @@
 #ifndef _wlc_phy_h_
 #define _wlc_phy_h_
 
-#include <typedefs.h>
 #include <wlioctl.h>
 #include <siutils.h>
 #include <d11.h>
index 8ec630115902ed24baec1818128a317994769f81..9513b87fa16344c1483c6d1fbd3f14c11490a676 100644 (file)
@@ -17,7 +17,8 @@
 #ifndef _wlc_phy_int_h_
 #define _wlc_phy_int_h_
 
-#include <typedefs.h>
+#include <linux/kernel.h>
+#include <bcmdefs.h>
 #include <bcmutils.h>
 
 #include <bcmsrom_fmt.h>
index c41db98ddcce98b888ff6ce11baaad8197e3e551..3d3112ed4e20499c9da964cf169ac80c1761205f 100644 (file)
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include <linux/kernel.h>
+#include <linux/string.h>
+#include <linux/bitops.h>
 #include <wlc_cfg.h>
 #include <qmath.h>
 #include <osl.h>
-#include <linux/kernel.h>
-#include <linux/string.h>
 #include <linuxver.h>
 #include <siutils.h>
-#include <linux/bitops.h>
 #include <hndpmu.h>
 
 #include <wlc_phy_radio.h>
index b7623ba13a480bf8e1ba827fe87c9a73a8cc8805..b7bfc7230dfc2c2b2a09ef5ea9a3e6f3ee7fc6a6 100644 (file)
@@ -17,8 +17,6 @@
 #ifndef _wlc_phy_lcn_h_
 #define _wlc_phy_lcn_h_
 
-#include <typedefs.h>
-
 struct phy_info_lcnphy {
        int lcnphy_txrf_sp_9_override;
        u8 lcnphy_full_cal_channel;
index 6e3dbfd7815c324834f4123f6b7944921d6ee93a..950008f122b1696b4a7e12567a22ff10b9557565 100644 (file)
  * 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 <siutils.h>
index e3d6dd183791a997d05c6b2b9cf300b3d920f8fc..6ce9e5d96830b02e6dae52b7d6c19b2020c52ca4 100644 (file)
@@ -14,8 +14,7 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <typedefs.h>
-
+#include <linux/types.h>
 #include <wlc_phy_int.h>
 #include <wlc_phytbl_lcn.h>
 
index bbc4cfae73e39e2c57540bc8ebe1f289f05d4754..7cc2c563c72730162e3b08cc192c91b14f7a22c8 100644 (file)
@@ -14,7 +14,7 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <typedefs.h>
+#include <linux/kernel.h>
 
 #include <wlc_phy_int.h>
 #include <wlc_phytbl_n.h>
index ff9cbccd54b85c31d3d305a058f9190dee3a45a9..ad635ee7758e2aca45e3d6cb5d60d67c19c48618 100644 (file)
 
 #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>
index 3254f5aa46c35752ccbea487a8a88d773db75530..a1ba37209f96ddfac61cb023c20292d9344083f6 100644 (file)
@@ -14,7 +14,6 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <typedefs.h>
 typedef struct d11init {
        u16 addr;
        u16 size;
index 93a3a016db59ca3f9d6d4c9a297dcbdbe71f7916..0b41a9cb1ec98ba18743bf8d4f0c393dff2e8dff 100644 (file)
@@ -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>
 
index f9953df851bb35f5667c36febf1dca2d7fd2f0a4..2dc89f9c26352ef00d99fc33598c9dab79311772 100644 (file)
  * 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>
index 1edc5346438a86088546b3e775fe610eb4d4f147..a4e49f3c1363c6d95025e0c8fc4f3f7c1764b7a8 100644 (file)
@@ -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>
index 1f5e62ac7a54ef281b6871baf1aee4ee73eb9cd1..5ff8831d2fa860f7b42e7240e8a6c9456514da30 100644 (file)
@@ -18,7 +18,6 @@
 
 #ifdef WLANTSEL
 
-#include <typedefs.h>
 #include <linux/kernel.h>
 #include <linuxver.h>
 #include <bcmdefs.h>
index 5f386d3e3bccba03f681717637a1fb00d37a8387..b70f9d099233becbc9d3585df5589c33bfd1e5fd 100644 (file)
 #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>
index 259f40945a7d7c2b5b153c8ddef7cf6e12c03a8f..509280337e34ff15d1f8e2f5781be4831b5a7f78 100644 (file)
  * 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>
index a2fdf485f405a8fc3cb04041ab5d6f1716b34e92..7c17e5f67c5f19779eebd750f7253d5c01cc1dbf 100644 (file)
@@ -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>
index e695a4839e98f0c3db5435c72c16dcbf02a3af29..feaffcc64ec6f7889168d2de1a811d867a2f91a8 100644 (file)
  * 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>
index 6980935af97e523fecdaf635949e7991597a3e08..bf8e2e1a15f64eeff973bc663caf3668186068ba 100644 (file)
  *   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>
index d4dcd058c4166c9f28f3e7e83ba7932c14bb5d43..d2d72568756dfdf3af8b64fb0ad3fd6c0ed93e2f 100644 (file)
  * 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>
index a1db289a1209c5fce3f7e267c09fa8a39dbc3f22..4728ad90e295f8bb25adb721b92078f54ccde4f7 100644 (file)
@@ -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>
index 65461d0d91da8e997b40d41ef7b4cf8d1d398c76..75a7e3a5c0094023abf0eeea75e6a5ae40cfbaf2 100644 (file)
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <typedefs.h>
-#include <bcmdefs.h>
-#include <osl.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <bcmdefs.h>
+#include <osl.h>
 #include <linuxver.h>
 #include <bcmutils.h>
 #include <siutils.h>
index 4a0161396d178501ee3fb14853f1c5706bc2a2c8..c909832c7ee11848b1dd08075b3f7bf3644ff57f 100644 (file)
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <typedefs.h>
-#include <bcmdefs.h>
-#include <osl.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <bcmdefs.h>
+#include <osl.h>
 #include <linuxver.h>
 #include <bcmdevs.h>
 #include <bcmutils.h>
index 62c055a833099f4fdadc731a8898fa3c48720697..1282ef7eb922ed419948603878663f0743b1f943 100644 (file)
  * 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 <bcmdefs.h>
-#include <osl.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <bcmdefs.h>
+#include <osl.h>
 #include <linuxver.h>
 #include <stdarg.h>
 #include <bcmutils.h>
index 5635e8698acc2b1366aef5dbfd4971f6bdca63e6..7ac64b6c00f61e04498dcb02b20af528ab663f62 100644 (file)
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <typedefs.h>
-#include <bcmdefs.h>
-#include <stdarg.h>
-#include <osl.h>
 #include <linux/ctype.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <bcmdefs.h>
+#include <stdarg.h>
+#include <osl.h>
 #include <linuxver.h>
 #include <bcmutils.h>
 #include <siutils.h>
index b83b12f0094dc2bd2657d3bae81ed31a75503c27..1bb6c78eece7dba9ee1f3e436990277312dc7c0d 100644 (file)
  * 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/ctype.h>
 #include <linux/kernel.h>
+#include <bcmdefs.h>
 #include <bcmutils.h>
 #include <bcmwifi.h>
 
index 3edef39962a73ed7e4c0564be521dbb96ea45bd1..fe503e7de563889c6511a67e321859269904436b 100644 (file)
@@ -14,7 +14,6 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <typedefs.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linuxver.h>
index f8deb1c51607c4f283228d054d903a180ac5d329..a8f3306c1d2b447c87c33e85cbc19e33ea1ef5b2 100644 (file)
  * 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 <bcmdefs.h>
-#include <osl.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <linuxver.h>
-#include <linux/kernel.h>
+#include <bcmdefs.h>
+#include <osl.h>
 #include <bcmutils.h>
 #include <siutils.h>
 #include <bcmdevs.h>
index 34450a4f0cbf81d86488a40657692655aee06108..2bb5b8722df66ef485a136c0e5234f872669c5ec 100644 (file)
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <typedefs.h>
+#include <linux/delay.h>
+#include <linux/fs.h>
+#ifdef mips
+#include <asm/paccess.h>
+#endif                         /* mips */
 #include <bcmendian.h>
 #include <linuxver.h>
 #include <bcmdefs.h>
 #include <osl.h>
 #include <bcmutils.h>
-#include <linux/delay.h>
-#ifdef mips
-#include <asm/paccess.h>
-#endif                         /* mips */
 #include <pcicfg.h>
 
-#include <linux/fs.h>
 
 #define PCI_CFG_RETRY          10
 
index 9ffbe10dbd7f8462fb3b2ede4489d11c97b992bd..23f86dd7b1598bc5d9ae3591594f8a9e94241e0f 100644 (file)
@@ -14,7 +14,6 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <typedefs.h>
 #include <linux/string.h>
 #include <linuxver.h>
 #include <bcmdefs.h>
index 7c5f88ddb4b1ab5585dcd73053cd83c73001079f..f80375cd68012626ccd6151259626b7853c4738a 100644 (file)
@@ -15,9 +15,8 @@
  */
 
 #include <linux/slab.h>
-#include <typedefs.h>
-#include <bcmdefs.h>
 #include <linux/string.h>
+#include <bcmdefs.h>
 #include <osl.h>
 #include <bcmutils.h>
 #include <siutils.h>
index 108fc2b04468768686e2f720e0fd61241dbd2fe6..40c9929de2bbe5baa8b6de7495b67c59dd90e53f 100644 (file)
@@ -14,6 +14,7 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include <linux/types.h>
 #include "qmath.h"
 
 /*
index ca49a805c99629301289426dca534ee52e6de5d8..e4c0baba553d82c362129ad37add164db6e43c38 100644 (file)
@@ -14,7 +14,7 @@
  * 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>
index 15e4ff449a2f794d4b866f967ba2d4f4e8fe8d84..f3ea7e1a7aefd1367615c890ca4f4d86837bf3cc 100644 (file)
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <typedefs.h>
-#include <bcmdefs.h>
-#include <osl.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <bcmdefs.h>
+#include <osl.h>
 #include <linuxver.h>
 #include <bcmutils.h>
 #include <siutils.h>