---

yaml --- r: 235634 b: refs/heads/master c: d8941ea h: refs/heads/master v: v3
git-mirror · Jan 21, 2011 · 7c9d6e8 · 7c9d6e8
1 parent 66daa33
commit 7c9d6e8
Show file tree

Hide file tree

Showing 37 changed files with 17 additions and 18 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5e72615c130d8fe9800711be2d713caeaa2d4a64
+refs/heads/master: d8941ea65ac3e0200e960957125be50f245d164c
diff --git a/trunk/drivers/staging/brcm80211/Makefile b/trunk/drivers/staging/brcm80211/Makefile
@@ -15,5 +15,8 @@
 # OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
 # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
+# one and only common flag
+subdir-ccflags-y := -DBCMDBG
+
 obj-$(CONFIG_BRCMFMAC)	+= brcmfmac/
 obj-$(CONFIG_BRCMSMAC)	+= brcmsmac/
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/Makefile b/trunk/drivers/staging/brcm80211/brcmfmac/Makefile
@@ -17,7 +17,6 @@
 
 ccflags-y :=			\
 	-DARP_OFFLOAD_SUPPORT	\
-	-DBCMDBG		\
 	-DBCMLXSDMMC		\
 	-DBCMPLATFORM_BUS	\
 	-DBCMSDIO		\
@@ -60,4 +59,3 @@ DHDOFILES = \
 
 obj-m += brcmfmac.o
 brcmfmac-objs += $(DHDOFILES)
-
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/Makefile b/trunk/drivers/staging/brcm80211/brcmsmac/Makefile
@@ -16,7 +16,6 @@
 # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ccflags-y :=					\
-	-DBCMDBG				\
 	-DWLC_HIGH				\
 	-DWLC_LOW				\
 	-DSTA					\
@@ -25,25 +24,24 @@ ccflags-y :=					\
 	-DDBAND					\
 	-DBCMDMA32				\
 	-DBCMNVRAMR				\
-	-Idrivers/staging/brcm80211/brcmsmac    \
-	-Idrivers/staging/brcm80211/brcmsmac/sys \
+	-Idrivers/staging/brcm80211/brcmsmac \
 	-Idrivers/staging/brcm80211/brcmsmac/phy \
 	-Idrivers/staging/brcm80211/util \
 	-Idrivers/staging/brcm80211/include
 
 BRCMSMAC_OFILES := \
-	sys/wl_mac80211.o \
-	sys/wl_ucode_loader.o \
-	sys/wlc_alloc.o \
-	sys/wlc_ampdu.o \
-	sys/wlc_antsel.o \
-	sys/wlc_bmac.o \
-	sys/wlc_channel.o \
-	sys/wlc_event.o \
-	sys/wlc_mac80211.o \
-	sys/wlc_phy_shim.o \
-	sys/wlc_rate.o \
-	sys/wlc_stf.o \
+	wl_mac80211.o \
+	wl_ucode_loader.o \
+	wlc_alloc.o \
+	wlc_ampdu.o \
+	wlc_antsel.o \
+	wlc_bmac.o \
+	wlc_channel.o \
+	wlc_event.o \
+	wlc_mac80211.o \
+	wlc_phy_shim.o \
+	wlc_rate.o \
+	wlc_stf.o \
 	phy/wlc_phy_cmn.o \
 	phy/wlc_phy_lcn.o \
 	phy/wlc_phy_n.o \

diff --git a/...ing/brcm80211/brcmsmac/sys/d11ucode_ext.h → ...staging/brcm80211/brcmsmac/d11ucode_ext.h b/...ing/brcm80211/brcmsmac/sys/d11ucode_ext.h → ...staging/brcm80211/brcmsmac/d11ucode_ext.h
diff --git a/...s/staging/brcm80211/brcmsmac/sys/wl_dbg.h → ...ivers/staging/brcm80211/brcmsmac/wl_dbg.h b/...s/staging/brcm80211/brcmsmac/sys/wl_dbg.h → ...ivers/staging/brcm80211/brcmsmac/wl_dbg.h
diff --git a/...taging/brcm80211/brcmsmac/sys/wl_export.h → ...rs/staging/brcm80211/brcmsmac/wl_export.h b/...taging/brcm80211/brcmsmac/sys/wl_export.h → ...rs/staging/brcm80211/brcmsmac/wl_export.h
diff --git a/...ging/brcm80211/brcmsmac/sys/wl_mac80211.c → .../staging/brcm80211/brcmsmac/wl_mac80211.c b/...ging/brcm80211/brcmsmac/sys/wl_mac80211.c → .../staging/brcm80211/brcmsmac/wl_mac80211.c
diff --git a/...ging/brcm80211/brcmsmac/sys/wl_mac80211.h → .../staging/brcm80211/brcmsmac/wl_mac80211.h b/...ging/brcm80211/brcmsmac/sys/wl_mac80211.h → .../staging/brcm80211/brcmsmac/wl_mac80211.h
diff --git a/...staging/brcm80211/brcmsmac/sys/wl_ucode.h → ...ers/staging/brcm80211/brcmsmac/wl_ucode.h b/...staging/brcm80211/brcmsmac/sys/wl_ucode.h → ...ers/staging/brcm80211/brcmsmac/wl_ucode.h
diff --git a/.../brcm80211/brcmsmac/sys/wl_ucode_loader.c → ...ging/brcm80211/brcmsmac/wl_ucode_loader.c b/.../brcm80211/brcmsmac/sys/wl_ucode_loader.c → ...ging/brcm80211/brcmsmac/wl_ucode_loader.c
diff --git a/...taging/brcm80211/brcmsmac/sys/wlc_alloc.c → ...rs/staging/brcm80211/brcmsmac/wlc_alloc.c b/...taging/brcm80211/brcmsmac/sys/wlc_alloc.c → ...rs/staging/brcm80211/brcmsmac/wlc_alloc.c
diff --git a/...taging/brcm80211/brcmsmac/sys/wlc_alloc.h → ...rs/staging/brcm80211/brcmsmac/wlc_alloc.h b/...taging/brcm80211/brcmsmac/sys/wlc_alloc.h → ...rs/staging/brcm80211/brcmsmac/wlc_alloc.h
diff --git a/...taging/brcm80211/brcmsmac/sys/wlc_ampdu.c → ...rs/staging/brcm80211/brcmsmac/wlc_ampdu.c b/...taging/brcm80211/brcmsmac/sys/wlc_ampdu.c → ...rs/staging/brcm80211/brcmsmac/wlc_ampdu.c
diff --git a/...taging/brcm80211/brcmsmac/sys/wlc_ampdu.h → ...rs/staging/brcm80211/brcmsmac/wlc_ampdu.h b/...taging/brcm80211/brcmsmac/sys/wlc_ampdu.h → ...rs/staging/brcm80211/brcmsmac/wlc_ampdu.h
diff --git a/...aging/brcm80211/brcmsmac/sys/wlc_antsel.c → ...s/staging/brcm80211/brcmsmac/wlc_antsel.c b/...aging/brcm80211/brcmsmac/sys/wlc_antsel.c → ...s/staging/brcm80211/brcmsmac/wlc_antsel.c
diff --git a/...aging/brcm80211/brcmsmac/sys/wlc_antsel.h → ...s/staging/brcm80211/brcmsmac/wlc_antsel.h b/...aging/brcm80211/brcmsmac/sys/wlc_antsel.h → ...s/staging/brcm80211/brcmsmac/wlc_antsel.h
diff --git a/...staging/brcm80211/brcmsmac/sys/wlc_bmac.c → ...ers/staging/brcm80211/brcmsmac/wlc_bmac.c b/...staging/brcm80211/brcmsmac/sys/wlc_bmac.c → ...ers/staging/brcm80211/brcmsmac/wlc_bmac.c
diff --git a/...staging/brcm80211/brcmsmac/sys/wlc_bmac.h → ...ers/staging/brcm80211/brcmsmac/wlc_bmac.h b/...staging/brcm80211/brcmsmac/sys/wlc_bmac.h → ...ers/staging/brcm80211/brcmsmac/wlc_bmac.h
diff --git a/...aging/brcm80211/brcmsmac/sys/wlc_bsscfg.h → ...s/staging/brcm80211/brcmsmac/wlc_bsscfg.h b/...aging/brcm80211/brcmsmac/sys/wlc_bsscfg.h → ...s/staging/brcm80211/brcmsmac/wlc_bsscfg.h
diff --git a/.../staging/brcm80211/brcmsmac/sys/wlc_cfg.h → ...vers/staging/brcm80211/brcmsmac/wlc_cfg.h b/.../staging/brcm80211/brcmsmac/sys/wlc_cfg.h → ...vers/staging/brcm80211/brcmsmac/wlc_cfg.h
diff --git a/...ging/brcm80211/brcmsmac/sys/wlc_channel.c → .../staging/brcm80211/brcmsmac/wlc_channel.c b/...ging/brcm80211/brcmsmac/sys/wlc_channel.c → .../staging/brcm80211/brcmsmac/wlc_channel.c
diff --git a/...ging/brcm80211/brcmsmac/sys/wlc_channel.h → .../staging/brcm80211/brcmsmac/wlc_channel.h b/...ging/brcm80211/brcmsmac/sys/wlc_channel.h → .../staging/brcm80211/brcmsmac/wlc_channel.h
diff --git a/...taging/brcm80211/brcmsmac/sys/wlc_event.c → ...rs/staging/brcm80211/brcmsmac/wlc_event.c b/...taging/brcm80211/brcmsmac/sys/wlc_event.c → ...rs/staging/brcm80211/brcmsmac/wlc_event.c
diff --git a/...taging/brcm80211/brcmsmac/sys/wlc_event.h → ...rs/staging/brcm80211/brcmsmac/wlc_event.h b/...taging/brcm80211/brcmsmac/sys/wlc_event.h → ...rs/staging/brcm80211/brcmsmac/wlc_event.h
diff --git a/.../staging/brcm80211/brcmsmac/sys/wlc_key.h → ...vers/staging/brcm80211/brcmsmac/wlc_key.h b/.../staging/brcm80211/brcmsmac/sys/wlc_key.h → ...vers/staging/brcm80211/brcmsmac/wlc_key.h
diff --git a/...ing/brcm80211/brcmsmac/sys/wlc_mac80211.c → ...staging/brcm80211/brcmsmac/wlc_mac80211.c b/...ing/brcm80211/brcmsmac/sys/wlc_mac80211.c → ...staging/brcm80211/brcmsmac/wlc_mac80211.c
diff --git a/...ing/brcm80211/brcmsmac/sys/wlc_mac80211.h → ...staging/brcm80211/brcmsmac/wlc_mac80211.h b/...ing/brcm80211/brcmsmac/sys/wlc_mac80211.h → ...staging/brcm80211/brcmsmac/wlc_mac80211.h
diff --git a/...ing/brcm80211/brcmsmac/sys/wlc_phy_shim.c → ...staging/brcm80211/brcmsmac/wlc_phy_shim.c b/...ing/brcm80211/brcmsmac/sys/wlc_phy_shim.c → ...staging/brcm80211/brcmsmac/wlc_phy_shim.c
diff --git a/...ing/brcm80211/brcmsmac/sys/wlc_phy_shim.h → ...staging/brcm80211/brcmsmac/wlc_phy_shim.h b/...ing/brcm80211/brcmsmac/sys/wlc_phy_shim.h → ...staging/brcm80211/brcmsmac/wlc_phy_shim.h
diff --git a/.../staging/brcm80211/brcmsmac/sys/wlc_pub.h → ...vers/staging/brcm80211/brcmsmac/wlc_pub.h b/.../staging/brcm80211/brcmsmac/sys/wlc_pub.h → ...vers/staging/brcm80211/brcmsmac/wlc_pub.h
diff --git a/...staging/brcm80211/brcmsmac/sys/wlc_rate.c → ...ers/staging/brcm80211/brcmsmac/wlc_rate.c b/...staging/brcm80211/brcmsmac/sys/wlc_rate.c → ...ers/staging/brcm80211/brcmsmac/wlc_rate.c
diff --git a/...staging/brcm80211/brcmsmac/sys/wlc_rate.h → ...ers/staging/brcm80211/brcmsmac/wlc_rate.h b/...staging/brcm80211/brcmsmac/sys/wlc_rate.h → ...ers/staging/brcm80211/brcmsmac/wlc_rate.h
diff --git a/.../staging/brcm80211/brcmsmac/sys/wlc_scb.h → ...vers/staging/brcm80211/brcmsmac/wlc_scb.h b/.../staging/brcm80211/brcmsmac/sys/wlc_scb.h → ...vers/staging/brcm80211/brcmsmac/wlc_scb.h
diff --git a/.../staging/brcm80211/brcmsmac/sys/wlc_stf.c → ...vers/staging/brcm80211/brcmsmac/wlc_stf.c b/.../staging/brcm80211/brcmsmac/sys/wlc_stf.c → ...vers/staging/brcm80211/brcmsmac/wlc_stf.c
diff --git a/.../staging/brcm80211/brcmsmac/sys/wlc_stf.h → ...vers/staging/brcm80211/brcmsmac/wlc_stf.h b/.../staging/brcm80211/brcmsmac/sys/wlc_stf.h → ...vers/staging/brcm80211/brcmsmac/wlc_stf.h
diff --git a/...taging/brcm80211/brcmsmac/sys/wlc_types.h → ...rs/staging/brcm80211/brcmsmac/wlc_types.h b/...taging/brcm80211/brcmsmac/sys/wlc_types.h → ...rs/staging/brcm80211/brcmsmac/wlc_types.h