staging: brcm80211: cleanup on the brcm80211 include directory

moved several files to specific source directory as these do not need to be shared between drivers. Also removed some unused include files from the include directory. Reviewed-by: Brett Rudley <brudley@broadcom.com> Reviewed-by: Henry Ptasinski <henryp@broadcom.com> Reviewed-by: Roland Vossen <rvossen@broadcom.com> Signed-off-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
git-mirror · Jan 21, 2011 · 5e72615 · 5e72615
1 parent f8559b6
commit 5e72615
Show file tree

Hide file tree

Showing 19 changed files with 1 addition and 191 deletions.
diff --git a/drivers/staging/brcm80211/include/bcmcdc.h → drivers/staging/brcm80211/brcmfmac/bcmcdc.h b/drivers/staging/brcm80211/include/bcmcdc.h → drivers/staging/brcm80211/brcmfmac/bcmcdc.h
diff --git a/drivers/staging/brcm80211/include/bcmsdbus.h → ...ers/staging/brcm80211/brcmfmac/bcmsdbus.h b/drivers/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/drivers/staging/brcm80211/include/dhdioctl.h → ...ers/staging/brcm80211/brcmfmac/dhdioctl.h b/drivers/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/drivers/staging/brcm80211/include/msgtrace.h → ...ers/staging/brcm80211/brcmfmac/msgtrace.h b/drivers/staging/brcm80211/include/msgtrace.h → ...ers/staging/brcm80211/brcmfmac/msgtrace.h
diff --git a/drivers/staging/brcm80211/include/sdioh.h → drivers/staging/brcm80211/brcmfmac/sdioh.h b/drivers/staging/brcm80211/include/sdioh.h → drivers/staging/brcm80211/brcmfmac/sdioh.h
diff --git a/drivers/staging/brcm80211/include/sdiovar.h → drivers/staging/brcm80211/brcmfmac/sdiovar.h b/drivers/staging/brcm80211/include/sdiovar.h → drivers/staging/brcm80211/brcmfmac/sdiovar.h
diff --git a/drivers/staging/brcm80211/brcmsmac/Makefile b/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/drivers/staging/brcm80211/include/d11.h → drivers/staging/brcm80211/brcmsmac/d11.h b/drivers/staging/brcm80211/include/d11.h → drivers/staging/brcm80211/brcmsmac/d11.h
diff --git a/drivers/staging/brcm80211/include/sbhndpio.h → ...ers/staging/brcm80211/brcmsmac/sbhndpio.h b/drivers/staging/brcm80211/include/sbhndpio.h → ...ers/staging/brcm80211/brcmsmac/sbhndpio.h
diff --git a/drivers/staging/brcm80211/brcmsmac/sys/wlc_event.c b/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/drivers/staging/brcm80211/include/rpc_osl.h b/drivers/staging/brcm80211/include/rpc_osl.h
diff --git a/drivers/staging/brcm80211/include/spid.h b/drivers/staging/brcm80211/include/spid.h
diff --git a/...s/staging/brcm80211/include/bcmsrom_tbl.h → drivers/staging/brcm80211/util/bcmsrom_tbl.h b/...s/staging/brcm80211/include/bcmsrom_tbl.h → drivers/staging/brcm80211/util/bcmsrom_tbl.h
diff --git a/drivers/staging/brcm80211/include/pci_core.h → drivers/staging/brcm80211/util/pci_core.h b/drivers/staging/brcm80211/include/pci_core.h → drivers/staging/brcm80211/util/pci_core.h
diff --git a/drivers/staging/brcm80211/include/sbpcmcia.h → drivers/staging/brcm80211/util/sbpcmcia.h b/drivers/staging/brcm80211/include/sbpcmcia.h → drivers/staging/brcm80211/util/sbpcmcia.h
diff --git a/drivers/staging/brcm80211/include/sbsocram.h → drivers/staging/brcm80211/util/sbsocram.h b/drivers/staging/brcm80211/include/sbsocram.h → drivers/staging/brcm80211/util/sbsocram.h