diff --git a/[refs] b/[refs]
index 77c78e2e12f8..ae0ef2224bc8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f835f455169913e89fe0c876cf10dfad15fb3a20
+refs/heads/master: 192f25a24f433886a97fc164182cd35963f0bf57
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/Makefile b/trunk/drivers/staging/brcm80211/brcmsmac/Makefile
index 1cd3a1eada96..ccf1ced2d2ea 100644
--- a/trunk/drivers/staging/brcm80211/brcmsmac/Makefile
+++ b/trunk/drivers/staging/brcm80211/brcmsmac/Makefile
@@ -53,7 +53,7 @@ BRCMSMAC_OFILES := \
 	nicpci.o \
 	../util/bcmutils.o \
 	../util/bcmwifi.o \
-	../util/nvram/nvram_ro.o
+	nvram.o
 
 MODULEPFX := brcmsmac
 
diff --git a/trunk/drivers/staging/brcm80211/util/nvram/nvram_ro.c b/trunk/drivers/staging/brcm80211/brcmsmac/nvram.c
similarity index 100%
rename from trunk/drivers/staging/brcm80211/util/nvram/nvram_ro.c
rename to trunk/drivers/staging/brcm80211/brcmsmac/nvram.c