diff options
| author | Arend van Spriel <arend@broadcom.com> | 2011-02-25 16:39:19 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-28 18:17:41 -0800 |
| commit | 16d691b60ea94be876cc12a62faa839803184a5e (patch) | |
| tree | d54d2b83ad07223182c14d08c6937ecdf9d054fa /drivers/staging/brcm80211/brcmsmac/wl_ucode_loader.c | |
| parent | 8a0939f500aac72e3bc47147c66c2575160a43ca (diff) | |
| download | op-kernel-dev-16d691b60ea94be876cc12a62faa839803184a5e.zip op-kernel-dev-16d691b60ea94be876cc12a62faa839803184a5e.tar.gz | |
staging: brcm80211: remove include file d11ucode_ext.h
Include file required by wl_ucode.h only so merged content of
d11ucode_ext.h into that include file to reduce number of include
files in the driver.
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/brcm80211/brcmsmac/wl_ucode_loader.c')
| -rw-r--r-- | drivers/staging/brcm80211/brcmsmac/wl_ucode_loader.c | 38 |
1 files changed, 27 insertions, 11 deletions
diff --git a/drivers/staging/brcm80211/brcmsmac/wl_ucode_loader.c b/drivers/staging/brcm80211/brcmsmac/wl_ucode_loader.c index c84e6a7..cc00dd1 100644 --- a/drivers/staging/brcm80211/brcmsmac/wl_ucode_loader.c +++ b/drivers/staging/brcm80211/brcmsmac/wl_ucode_loader.c @@ -16,20 +16,36 @@ #include <linux/types.h> #include <bcmdefs.h> -#include <d11ucode_ext.h> #include <wl_ucode.h> +enum { + D11UCODE_NAMETAG_START = 0, + D11LCN0BSINITVALS24, + D11LCN0INITVALS24, + D11LCN1BSINITVALS24, + D11LCN1INITVALS24, + D11LCN2BSINITVALS24, + D11LCN2INITVALS24, + D11N0ABSINITVALS16, + D11N0BSINITVALS16, + D11N0INITVALS16, + D11UCODE_OVERSIGHT16_MIMO, + D11UCODE_OVERSIGHT16_MIMOSZ, + D11UCODE_OVERSIGHT24_LCN, + D11UCODE_OVERSIGHT24_LCNSZ, + D11UCODE_OVERSIGHT_BOMMAJOR, + D11UCODE_OVERSIGHT_BOMMINOR +}; - -d11init_t *d11lcn0bsinitvals24; -d11init_t *d11lcn0initvals24; -d11init_t *d11lcn1bsinitvals24; -d11init_t *d11lcn1initvals24; -d11init_t *d11lcn2bsinitvals24; -d11init_t *d11lcn2initvals24; -d11init_t *d11n0absinitvals16; -d11init_t *d11n0bsinitvals16; -d11init_t *d11n0initvals16; +struct d11init *d11lcn0bsinitvals24; +struct d11init *d11lcn0initvals24; +struct d11init *d11lcn1bsinitvals24; +struct d11init *d11lcn1initvals24; +struct d11init *d11lcn2bsinitvals24; +struct d11init *d11lcn2initvals24; +struct d11init *d11n0absinitvals16; +struct d11init *d11n0bsinitvals16; +struct d11init *d11n0initvals16; u32 *bcm43xx_16_mimo; u32 bcm43xx_16_mimosz; u32 *bcm43xx_24_lcn; |
