---

yaml --- r: 259375 b: refs/heads/master c: 31c9f6d h: refs/heads/master i: 259373: 47bd5de 259371: dec2937 259367: e3c926e 259359: 66d29aa v: v3
git-mirror · Jun 7, 2011 · 4084dec · 4084dec
1 parent 5c81ad4
commit 4084dec
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b6fe70c3aa866db38b72d1cf84b41c4cae80c87b
+refs/heads/master: 31c9f6d970f3b7bc5d58267c6f6aba94cce23872
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c b/trunk/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/...vers/staging/brcm80211/include/bcmsdpcm.h → ...ers/staging/brcm80211/brcmfmac/bcmsdpcm.h b/...vers/staging/brcm80211/include/bcmsdpcm.h → ...ers/staging/brcm80211/brcmfmac/bcmsdpcm.h
diff --git a/...vers/staging/brcm80211/include/bcmnvram.h → ...ers/staging/brcm80211/brcmsmac/bcmnvram.h b/...vers/staging/brcm80211/include/bcmnvram.h → ...ers/staging/brcm80211/brcmsmac/bcmnvram.h
diff --git a/...rivers/staging/brcm80211/include/bcmotp.h → ...ivers/staging/brcm80211/brcmsmac/bcmotp.h b/...rivers/staging/brcm80211/include/bcmotp.h → ...ivers/staging/brcm80211/brcmsmac/bcmotp.h
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/bcmsrom.c b/trunk/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/trunk/drivers/staging/brcm80211/util/bcmutils.c b/trunk/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");