diff options
| author | Roland Vossen <rvossen@broadcom.com> | 2011-06-01 13:45:20 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-06-07 12:36:56 -0700 |
| commit | 31c9f6d970f3b7bc5d58267c6f6aba94cce23872 (patch) | |
| tree | 7ba213229f7379b920f1bb63810a556a843e14cc | |
| parent | b6fe70c3aa866db38b72d1cf84b41c4cae80c87b (diff) | |
| download | linux-31c9f6d970f3b7bc5d58267c6f6aba94cce23872.tar.gz | |
staging: brcm80211: moved header files to more specific directory
Code cleanup. Header files only used by the softmac were moved to the
brcmsmac dir, same approach for fullmac header files.
Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c | 1 | ||||
| -rw-r--r-- | drivers/staging/brcm80211/brcmfmac/bcmsdpcm.h (renamed from drivers/staging/brcm80211/include/bcmsdpcm.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/brcm80211/brcmsmac/bcmnvram.h (renamed from drivers/staging/brcm80211/include/bcmnvram.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/brcm80211/brcmsmac/bcmotp.h (renamed from drivers/staging/brcm80211/include/bcmotp.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/brcm80211/brcmsmac/bcmsrom.c | 3 | ||||
| -rw-r--r-- | drivers/staging/brcm80211/util/bcmutils.c | 1 |
6 files changed, 3 insertions, 2 deletions
diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c index e57dd0039c2d..d44150067c6a 100644 --- a/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c +++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c @@ -24,7 +24,6 @@ #include <linux/pci.h> #include <linux/completion.h> -#include <pcicfg.h> #include <bcmdefs.h> #include <bcmdevs.h> #include <bcmutils.h> diff --git a/drivers/staging/brcm80211/include/bcmsdpcm.h b/drivers/staging/brcm80211/brcmfmac/bcmsdpcm.h index 21d6a3ad161a..21d6a3ad161a 100644 --- a/drivers/staging/brcm80211/include/bcmsdpcm.h +++ b/drivers/staging/brcm80211/brcmfmac/bcmsdpcm.h diff --git a/drivers/staging/brcm80211/include/bcmnvram.h b/drivers/staging/brcm80211/brcmsmac/bcmnvram.h index 12645ddf000d..12645ddf000d 100644 --- a/drivers/staging/brcm80211/include/bcmnvram.h +++ b/drivers/staging/brcm80211/brcmsmac/bcmnvram.h diff --git a/drivers/staging/brcm80211/include/bcmotp.h b/drivers/staging/brcm80211/brcmsmac/bcmotp.h index 5803accaa479..5803accaa479 100644 --- a/drivers/staging/brcm80211/include/bcmotp.h +++ b/drivers/staging/brcm80211/brcmsmac/bcmotp.h diff --git a/drivers/staging/brcm80211/brcmsmac/bcmsrom.c b/drivers/staging/brcm80211/brcmsmac/bcmsrom.c index d374673c295f..311bc0cdaa8e 100644 --- a/drivers/staging/brcm80211/brcmsmac/bcmsrom.c +++ b/drivers/staging/brcm80211/brcmsmac/bcmsrom.c @@ -362,6 +362,9 @@ #define SRFL_LEDDC 0x40 /* value is an LED duty cycle */ #define SRFL_NOVAR 0x80 /* do not generate a nvram param, entry is for mfgc */ +/* Max. nvram variable table size */ +#define MAXSZ_NVRAM_VARS 4096 + typedef struct { const char *name; u32 revmask; diff --git a/drivers/staging/brcm80211/util/bcmutils.c b/drivers/staging/brcm80211/util/bcmutils.c index b78ce5425a23..2724d7c8171b 100644 --- a/drivers/staging/brcm80211/util/bcmutils.c +++ b/drivers/staging/brcm80211/util/bcmutils.c @@ -25,7 +25,6 @@ #include <bcmdefs.h> #include <stdarg.h> #include <bcmutils.h> -#include <bcmnvram.h> #include <bcmdevs.h> MODULE_AUTHOR("Broadcom Corporation"); |