diff --git a/[refs] b/[refs]
index e3a3e6270fea..4151b221e4ac 100644
--- 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
index e57dd0039c2d..d44150067c6a 100644
--- 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/trunk/drivers/staging/brcm80211/include/bcmsdpcm.h b/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdpcm.h
similarity index 100%
rename from trunk/drivers/staging/brcm80211/include/bcmsdpcm.h
rename to trunk/drivers/staging/brcm80211/brcmfmac/bcmsdpcm.h
diff --git a/trunk/drivers/staging/brcm80211/include/bcmnvram.h b/trunk/drivers/staging/brcm80211/brcmsmac/bcmnvram.h
similarity index 100%
rename from trunk/drivers/staging/brcm80211/include/bcmnvram.h
rename to trunk/drivers/staging/brcm80211/brcmsmac/bcmnvram.h
diff --git a/trunk/drivers/staging/brcm80211/include/bcmotp.h b/trunk/drivers/staging/brcm80211/brcmsmac/bcmotp.h
similarity index 100%
rename from trunk/drivers/staging/brcm80211/include/bcmotp.h
rename to trunk/drivers/staging/brcm80211/brcmsmac/bcmotp.h
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/bcmsrom.c b/trunk/drivers/staging/brcm80211/brcmsmac/bcmsrom.c
index d374673c295f..311bc0cdaa8e 100644
--- 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
index b78ce5425a23..2724d7c8171b 100644
--- 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");