---

yaml --- r: 249397 b: refs/heads/master c: 47d3025 h: refs/heads/master i: 249395: 27effb4 v: v3
git-mirror · May 10, 2011 · 4c3b7a5 · 4c3b7a5
1 parent 2b7ee7a
commit 4c3b7a5
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9fb137c581861ffcda5419fac4b80cb0372b1964
+refs/heads/master: 47d30257706a90926de396bc3055684d9215abd9
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/Makefile b/trunk/drivers/staging/brcm80211/brcmsmac/Makefile
@@ -25,7 +25,6 @@ ccflags-y :=				\
 	-DBCMNVRAMR				\
 	-Idrivers/staging/brcm80211/brcmsmac \
 	-Idrivers/staging/brcm80211/brcmsmac/phy \
-	-Idrivers/staging/brcm80211/util \
 	-Idrivers/staging/brcm80211/include
 
 BRCMSMAC_OFILES := \
@@ -48,12 +47,12 @@ BRCMSMAC_OFILES := \
 	phy/wlc_phytbl_lcn.o \
 	phy/wlc_phytbl_n.o \
 	phy/wlc_phy_qmath.o \
+	bcmotp.o \
+	bcmsrom.o \
+	hnddma.o \
+	nicpci.o \
 	../util/bcmutils.o \
 	../util/bcmwifi.o \
-	../util/bcmotp.o \
-	../util/bcmsrom.o \
-	../util/hnddma.o \
-	../util/nicpci.o \
 	../util/nvram/nvram_ro.o
 
 MODULEPFX := brcmsmac

diff --git a/...k/drivers/staging/brcm80211/util/bcmotp.c → ...ivers/staging/brcm80211/brcmsmac/bcmotp.c b/...k/drivers/staging/brcm80211/util/bcmotp.c → ...ivers/staging/brcm80211/brcmsmac/bcmotp.c
diff --git a/.../drivers/staging/brcm80211/util/bcmsrom.c → ...vers/staging/brcm80211/brcmsmac/bcmsrom.c b/.../drivers/staging/brcm80211/util/bcmsrom.c → ...vers/staging/brcm80211/brcmsmac/bcmsrom.c
diff --git a/...vers/staging/brcm80211/util/bcmsrom_tbl.h → .../staging/brcm80211/brcmsmac/bcmsrom_tbl.h b/...vers/staging/brcm80211/util/bcmsrom_tbl.h → .../staging/brcm80211/brcmsmac/bcmsrom_tbl.h
diff --git a/...k/drivers/staging/brcm80211/util/hnddma.c → ...ivers/staging/brcm80211/brcmsmac/hnddma.c b/...k/drivers/staging/brcm80211/util/hnddma.c → ...ivers/staging/brcm80211/brcmsmac/hnddma.c
diff --git a/...k/drivers/staging/brcm80211/util/nicpci.c → ...ivers/staging/brcm80211/brcmsmac/nicpci.c b/...k/drivers/staging/brcm80211/util/nicpci.c → ...ivers/staging/brcm80211/brcmsmac/nicpci.c