---

yaml --- r: 236214 b: refs/heads/master c: 7ae9262 h: refs/heads/master v: v3
git-mirror · Mar 2, 2011 · c39f64c · c39f64c
1 parent ab6cc62
commit c39f64c
Show file tree

Hide file tree

Showing 11 changed files with 10 additions and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 83aa3c7bf3f04a04e92637de979c6de19160aa7f
+refs/heads/master: 7ae92624969bdee951b64f638898ac9f96646558
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/Makefile b/trunk/drivers/staging/brcm80211/brcmsmac/Makefile
@@ -36,7 +36,7 @@ BRCMSMAC_OFILES := \
 	wlc_antsel.o \
 	wlc_bmac.o \
 	wlc_channel.o \
-	wlc_mac80211.o \
+	wlc_main.o \
 	wlc_phy_shim.o \
 	wlc_rate.o \
 	wlc_stf.o \

diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_alloc.c b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_alloc.c
@@ -35,7 +35,7 @@
 #include "wlc_bsscfg.h"
 #include "phy/wlc_phy_hal.h"
 #include "wlc_channel.h"
-#include "wlc_mac80211.h"
+#include "wlc_main.h"
 
 static struct wlc_bsscfg *wlc_bsscfg_malloc(uint unit);
 static void wlc_bsscfg_mfree(struct wlc_bsscfg *cfg);

diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c
@@ -37,7 +37,7 @@
 #include "wl_dbg.h"
 #include "wlc_bsscfg.h"
 #include "wlc_channel.h"
-#include "wlc_mac80211.h"
+#include "wlc_main.h"
 #include "wlc_ampdu.h"
 
 /*

diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_antsel.c b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_antsel.c
@@ -38,7 +38,7 @@
 #include "wlc_bmac.h"
 #include "wlc_channel.h"
 #include "wlc_bsscfg.h"
-#include "wlc_mac80211.h"
+#include "wlc_main.h"
 #include "wl_export.h"
 #include "wlc_phy_shim.h"
 #include "wlc_antsel.h"

diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c
@@ -49,7 +49,7 @@
 #include "phy/wlc_phy_hal.h"
 #include "wlc_channel.h"
 #include "wlc_bsscfg.h"
-#include "wlc_mac80211.h"
+#include "wlc_main.h"
 #include "wl_export.h"
 #include "wl_ucode.h"
 #include "wlc_antsel.h"

diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_channel.c b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_channel.c
@@ -37,7 +37,7 @@
 #include "wlc_rate.h"
 #include "wlc_channel.h"
 #include "wlc_bsscfg.h"
-#include "wlc_mac80211.h"
+#include "wlc_main.h"
 #include "wlc_stf.h"
 #include "wl_dbg.h"
 

diff --git a/...staging/brcm80211/brcmsmac/wlc_mac80211.c → ...ers/staging/brcm80211/brcmsmac/wlc_main.c b/...staging/brcm80211/brcmsmac/wlc_mac80211.c → ...ers/staging/brcm80211/brcmsmac/wlc_main.c
@@ -41,7 +41,7 @@
 #include "wlc_bsscfg.h"
 #include "phy/wlc_phy_hal.h"
 #include "wlc_channel.h"
-#include "wlc_mac80211.h"
+#include "wlc_main.h"
 #include "wlc_bmac.h"
 #include "wlc_phy_hal.h"
 #include "wlc_phy_shim.h"

diff --git a/...staging/brcm80211/brcmsmac/wlc_mac80211.h → ...ers/staging/brcm80211/brcmsmac/wlc_main.h b/...staging/brcm80211/brcmsmac/wlc_mac80211.h → ...ers/staging/brcm80211/brcmsmac/wlc_main.h
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c
@@ -54,7 +54,7 @@
 #include "wlc_phy_hal.h"
 #include "wl_export.h"
 #include "wlc_bsscfg.h"
-#include "wlc_mac80211.h"
+#include "wlc_main.h"
 #include "wlc_phy_shim.h"
 
 /* PHY SHIM module specific state */

diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_stf.c b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_stf.c
@@ -38,7 +38,7 @@
 #include "phy/wlc_phy_hal.h"
 #include "wlc_channel.h"
 #include "wlc_bsscfg.h"
-#include "wlc_mac80211.h"
+#include "wlc_main.h"
 #include "wl_export.h"
 #include "wlc_bmac.h"
 #include "wlc_stf.h"