---

yaml --- r: 235633 b: refs/heads/master c: 5e72615 h: refs/heads/master i: 235631: fa2d1b4 v: v3
git-mirror · Jan 21, 2011 · 66daa33 · 66daa33
1 parent ce26c44
commit 66daa33
Show file tree

Hide file tree

Showing 20 changed files with 2 additions and 192 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f8559b6920b435028ec9aed62846906bb20e47d8
+refs/heads/master: 5e72615c130d8fe9800711be2d713caeaa2d4a64
diff --git a/...rivers/staging/brcm80211/include/bcmcdc.h → ...ivers/staging/brcm80211/brcmfmac/bcmcdc.h b/...rivers/staging/brcm80211/include/bcmcdc.h → ...ivers/staging/brcm80211/brcmfmac/bcmcdc.h
diff --git a/...vers/staging/brcm80211/include/bcmsdbus.h → ...ers/staging/brcm80211/brcmfmac/bcmsdbus.h b/...vers/staging/brcm80211/include/bcmsdbus.h → ...ers/staging/brcm80211/brcmfmac/bcmsdbus.h
diff --git a/.../staging/brcm80211/include/bcmsdh_sdmmc.h → ...staging/brcm80211/brcmfmac/bcmsdh_sdmmc.h b/.../staging/brcm80211/include/bcmsdh_sdmmc.h → ...staging/brcm80211/brcmfmac/bcmsdh_sdmmc.h
diff --git a/...vers/staging/brcm80211/include/dhdioctl.h → ...ers/staging/brcm80211/brcmfmac/dhdioctl.h b/...vers/staging/brcm80211/include/dhdioctl.h → ...ers/staging/brcm80211/brcmfmac/dhdioctl.h
diff --git a/...taging/brcm80211/include/hndrte_armtrap.h → ...aging/brcm80211/brcmfmac/hndrte_armtrap.h b/...taging/brcm80211/include/hndrte_armtrap.h → ...aging/brcm80211/brcmfmac/hndrte_armtrap.h
diff --git a/...s/staging/brcm80211/include/hndrte_cons.h → .../staging/brcm80211/brcmfmac/hndrte_cons.h b/...s/staging/brcm80211/include/hndrte_cons.h → .../staging/brcm80211/brcmfmac/hndrte_cons.h
diff --git a/...vers/staging/brcm80211/include/msgtrace.h → ...ers/staging/brcm80211/brcmfmac/msgtrace.h b/...vers/staging/brcm80211/include/msgtrace.h → ...ers/staging/brcm80211/brcmfmac/msgtrace.h
diff --git a/...drivers/staging/brcm80211/include/sdioh.h → ...rivers/staging/brcm80211/brcmfmac/sdioh.h b/...drivers/staging/brcm80211/include/sdioh.h → ...rivers/staging/brcm80211/brcmfmac/sdioh.h
diff --git a/...ivers/staging/brcm80211/include/sdiovar.h → ...vers/staging/brcm80211/brcmfmac/sdiovar.h b/...ivers/staging/brcm80211/include/sdiovar.h → ...vers/staging/brcm80211/brcmfmac/sdiovar.h
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/Makefile b/trunk/drivers/staging/brcm80211/brcmsmac/Makefile
@@ -25,6 +25,7 @@ ccflags-y :=					\
 	-DDBAND					\
 	-DBCMDMA32				\
 	-DBCMNVRAMR				\
+	-Idrivers/staging/brcm80211/brcmsmac    \
 	-Idrivers/staging/brcm80211/brcmsmac/sys \
 	-Idrivers/staging/brcm80211/brcmsmac/phy \
 	-Idrivers/staging/brcm80211/util \

diff --git a/...k/drivers/staging/brcm80211/include/d11.h → .../drivers/staging/brcm80211/brcmsmac/d11.h b/...k/drivers/staging/brcm80211/include/d11.h → .../drivers/staging/brcm80211/brcmsmac/d11.h
diff --git a/...vers/staging/brcm80211/include/sbhndpio.h → ...ers/staging/brcm80211/brcmsmac/sbhndpio.h b/...vers/staging/brcm80211/include/sbhndpio.h → ...ers/staging/brcm80211/brcmsmac/sbhndpio.h
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/sys/wlc_event.c b/trunk/drivers/staging/brcm80211/brcmsmac/sys/wlc_event.c
@@ -33,9 +33,6 @@
 #include <d11.h>
 #include <wlc_rate.h>
 #include <wlc_mac80211.h>
-#ifdef MSGTRACE
-#include <msgtrace.h>
-#endif
 #include <wl_dbg.h>
 
 /* Local prototypes */

diff --git a/trunk/drivers/staging/brcm80211/include/rpc_osl.h b/trunk/drivers/staging/brcm80211/include/rpc_osl.h
diff --git a/trunk/drivers/staging/brcm80211/include/spid.h b/trunk/drivers/staging/brcm80211/include/spid.h
diff --git a/...s/staging/brcm80211/include/bcmsrom_tbl.h → ...vers/staging/brcm80211/util/bcmsrom_tbl.h b/...s/staging/brcm80211/include/bcmsrom_tbl.h → ...vers/staging/brcm80211/util/bcmsrom_tbl.h
diff --git a/...vers/staging/brcm80211/include/pci_core.h → ...drivers/staging/brcm80211/util/pci_core.h b/...vers/staging/brcm80211/include/pci_core.h → ...drivers/staging/brcm80211/util/pci_core.h
diff --git a/...vers/staging/brcm80211/include/sbpcmcia.h → ...drivers/staging/brcm80211/util/sbpcmcia.h b/...vers/staging/brcm80211/include/sbpcmcia.h → ...drivers/staging/brcm80211/util/sbpcmcia.h
diff --git a/...vers/staging/brcm80211/include/sbsocram.h → ...drivers/staging/brcm80211/util/sbsocram.h b/...vers/staging/brcm80211/include/sbsocram.h → ...drivers/staging/brcm80211/util/sbsocram.h