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 <[email protected]> Reviewed-by: Arend van Spriel <[email protected]> --- drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c | 1 - .../brcm80211/{include => brcmfmac}/bcmsdpcm.h | 0 .../brcm80211/{include => brcmsmac}/bcmnvram.h | 0 .../brcm80211/{include => brcmsmac}/bcmotp.h | 0 drivers/staging/brcm80211/brcmsmac/bcmsrom.c | 3 +++ drivers/staging/brcm80211/util/bcmutils.c | 1 - 6 files changed, 3 insertions(+), 2 deletions(-) rename drivers/staging/brcm80211/{include => brcmfmac}/bcmsdpcm.h (100%) rename drivers/staging/brcm80211/{include => brcmsmac}/bcmnvram.h (100%) rename drivers/staging/brcm80211/{include => brcmsmac}/bcmotp.h (100%) diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c index e57dd00..d441500 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 similarity index 100% rename from drivers/staging/brcm80211/include/bcmsdpcm.h rename to drivers/staging/brcm80211/brcmfmac/bcmsdpcm.h diff --git a/drivers/staging/brcm80211/include/bcmnvram.h b/drivers/staging/brcm80211/brcmsmac/bcmnvram.h similarity index 100% rename from drivers/staging/brcm80211/include/bcmnvram.h rename to drivers/staging/brcm80211/brcmsmac/bcmnvram.h diff --git a/drivers/staging/brcm80211/include/bcmotp.h b/drivers/staging/brcm80211/brcmsmac/bcmotp.h similarity index 100% rename from drivers/staging/brcm80211/include/bcmotp.h rename to drivers/staging/brcm80211/brcmsmac/bcmotp.h diff --git a/drivers/staging/brcm80211/brcmsmac/bcmsrom.c b/drivers/staging/brcm80211/brcmsmac/bcmsrom.c index d374673..311bc0c 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 63843bc..c23e9b5 100644 --- a/drivers/staging/brcm80211/util/bcmutils.c +++ b/drivers/staging/brcm80211/util/bcmutils.c @@ -24,7 +24,6 @@ #include <bcmdefs.h> #include <stdarg.h> #include <bcmutils.h> -#include <bcmnvram.h> #include <bcmdevs.h> MODULE_AUTHOR("Broadcom Corporation"); -- 1.7.4.1 _______________________________________________ devel mailing list [email protected] http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
