---

yaml --- r: 259422 b: refs/heads/master c: 225fa52 h: refs/heads/master v: v3
git-mirror · Jun 7, 2011 · d6d0626 · d6d0626
1 parent 406413b
commit d6d0626
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a9cfc9b0b5ce1e52a1486553a9dad82df0ef3755
+refs/heads/master: 225fa52c2397605892477a53f388aa49ef7d8c5a
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/Makefile b/trunk/drivers/staging/brcm80211/brcmsmac/Makefile
@@ -33,7 +33,7 @@ BRCMSMAC_OFILES := \
 	alloc.o \
 	ampdu.o \
 	antsel.o \
-	bottom_mac.o \
+	bmac.o \
 	channel.o \
 	main.o \
 	phy_shim.o \

diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/antsel.c b/trunk/drivers/staging/brcm80211/brcmsmac/antsel.c
@@ -29,7 +29,7 @@
 #include "scb.h"
 #include "pub.h"
 #include "phy/phy_hal.h"
-#include "bottom_mac.h"
+#include "bmac.h"
 #include "channel.h"
 #include "main.h"
 #include "antsel.h"

diff --git a/...s/staging/brcm80211/brcmsmac/bottom_mac.c → ...drivers/staging/brcm80211/brcmsmac/bmac.c b/...s/staging/brcm80211/brcmsmac/bottom_mac.c → ...drivers/staging/brcm80211/brcmsmac/bmac.c
@@ -44,7 +44,7 @@
 #include "ucode_loader.h"
 #include "antsel.h"
 #include "alloc.h"
-#include "bottom_mac.h"
+#include "bmac.h"
 #include "mac80211_if.h"
 
 #define	TIMER_INTERVAL_WATCHDOG_BMAC	1000	/* watchdog timer, in unit of ms */

diff --git a/...s/staging/brcm80211/brcmsmac/bottom_mac.h → ...drivers/staging/brcm80211/brcmsmac/bmac.h b/...s/staging/brcm80211/brcmsmac/bottom_mac.h → ...drivers/staging/brcm80211/brcmsmac/bmac.h
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/channel.c b/trunk/drivers/staging/brcm80211/brcmsmac/channel.c
@@ -29,7 +29,7 @@
 #include "scb.h"
 #include "pub.h"
 #include "phy/phy_hal.h"
-#include "bottom_mac.h"
+#include "bmac.h"
 #include "rate.h"
 #include "channel.h"
 #include "main.h"

diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/main.c b/trunk/drivers/staging/brcm80211/brcmsmac/main.c
@@ -36,7 +36,7 @@
 #include "phy/phy_hal.h"
 #include "channel.h"
 #include "main.h"
-#include "bottom_mac.h"
+#include "bmac.h"
 #include "phy_hal.h"
 #include "antsel.h"
 #include "stf.h"

diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/phy_shim.c b/trunk/drivers/staging/brcm80211/brcmsmac/phy_shim.c
@@ -40,7 +40,7 @@
 #include "phy/phy_hal.h"
 #include "channel.h"
 #include "srom.h"
-#include "bottom_mac.h"
+#include "bmac.h"
 #include "phy_hal.h"
 #include "main.h"
 #include "phy_shim.h"

diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/stf.c b/trunk/drivers/staging/brcm80211/brcmsmac/stf.c
@@ -31,7 +31,7 @@
 #include "phy/phy_hal.h"
 #include "channel.h"
 #include "main.h"
-#include "bottom_mac.h"
+#include "bmac.h"
 #include "stf.h"
 
 #define MIN_SPATIAL_EXPANSION	0