---

yaml --- r: 249402 b: refs/heads/master c: 192f25a h: refs/heads/master v: v3
git-mirror · May 10, 2011 · ecd097f · ecd097f
1 parent c2de60c
commit ecd097f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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/...s/staging/brcm80211/util/nvram/nvram_ro.c → ...rivers/staging/brcm80211/brcmsmac/nvram.c b/...s/staging/brcm80211/util/nvram/nvram_ro.c → ...rivers/staging/brcm80211/brcmsmac/nvram.c