diff options
author | Arend van Spriel <arend@broadcom.com> | 2011-01-21 10:54:50 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-01-21 12:00:03 -0800 |
commit | d8941ea65ac3e0200e960957125be50f245d164c (patch) | |
tree | 1a4a06afe12ad86521433038a1d6a8b699e7147d | |
parent | 5e72615c130d8fe9800711be2d713caeaa2d4a64 (diff) | |
download | linux-d8941ea65ac3e0200e960957125be50f245d164c.tar.bz2 |
staging: brcm80211: removed sys directory layer from brcmsmac driver
Based on review comments moved sources from brcm80211/brcmsmac/sys
to its parent directory. The phy directory is kept for maintainance
logistics around phy source code.
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>
-rw-r--r-- | drivers/staging/brcm80211/Makefile | 3 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/Makefile | 2 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/Makefile | 28 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/d11ucode_ext.h (renamed from drivers/staging/brcm80211/brcmsmac/sys/d11ucode_ext.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/wl_dbg.h (renamed from drivers/staging/brcm80211/brcmsmac/sys/wl_dbg.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/wl_export.h (renamed from drivers/staging/brcm80211/brcmsmac/sys/wl_export.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/wl_mac80211.c (renamed from drivers/staging/brcm80211/brcmsmac/sys/wl_mac80211.c) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/wl_mac80211.h (renamed from drivers/staging/brcm80211/brcmsmac/sys/wl_mac80211.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/wl_ucode.h (renamed from drivers/staging/brcm80211/brcmsmac/sys/wl_ucode.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/wl_ucode_loader.c (renamed from drivers/staging/brcm80211/brcmsmac/sys/wl_ucode_loader.c) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/wlc_alloc.c (renamed from drivers/staging/brcm80211/brcmsmac/sys/wlc_alloc.c) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/wlc_alloc.h (renamed from drivers/staging/brcm80211/brcmsmac/sys/wlc_alloc.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c (renamed from drivers/staging/brcm80211/brcmsmac/sys/wlc_ampdu.c) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/wlc_ampdu.h (renamed from drivers/staging/brcm80211/brcmsmac/sys/wlc_ampdu.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/wlc_antsel.c (renamed from drivers/staging/brcm80211/brcmsmac/sys/wlc_antsel.c) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/wlc_antsel.h (renamed from drivers/staging/brcm80211/brcmsmac/sys/wlc_antsel.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/wlc_bmac.c (renamed from drivers/staging/brcm80211/brcmsmac/sys/wlc_bmac.c) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/wlc_bmac.h (renamed from drivers/staging/brcm80211/brcmsmac/sys/wlc_bmac.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/wlc_bsscfg.h (renamed from drivers/staging/brcm80211/brcmsmac/sys/wlc_bsscfg.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/wlc_cfg.h (renamed from drivers/staging/brcm80211/brcmsmac/sys/wlc_cfg.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/wlc_channel.c (renamed from drivers/staging/brcm80211/brcmsmac/sys/wlc_channel.c) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/wlc_channel.h (renamed from drivers/staging/brcm80211/brcmsmac/sys/wlc_channel.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/wlc_event.c (renamed from drivers/staging/brcm80211/brcmsmac/sys/wlc_event.c) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/wlc_event.h (renamed from drivers/staging/brcm80211/brcmsmac/sys/wlc_event.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/wlc_key.h (renamed from drivers/staging/brcm80211/brcmsmac/sys/wlc_key.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c (renamed from drivers/staging/brcm80211/brcmsmac/sys/wlc_mac80211.c) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/wlc_mac80211.h (renamed from drivers/staging/brcm80211/brcmsmac/sys/wlc_mac80211.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c (renamed from drivers/staging/brcm80211/brcmsmac/sys/wlc_phy_shim.c) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.h (renamed from drivers/staging/brcm80211/brcmsmac/sys/wlc_phy_shim.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/wlc_pub.h (renamed from drivers/staging/brcm80211/brcmsmac/sys/wlc_pub.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/wlc_rate.c (renamed from drivers/staging/brcm80211/brcmsmac/sys/wlc_rate.c) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/wlc_rate.h (renamed from drivers/staging/brcm80211/brcmsmac/sys/wlc_rate.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/wlc_scb.h (renamed from drivers/staging/brcm80211/brcmsmac/sys/wlc_scb.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/wlc_stf.c (renamed from drivers/staging/brcm80211/brcmsmac/sys/wlc_stf.c) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/wlc_stf.h (renamed from drivers/staging/brcm80211/brcmsmac/sys/wlc_stf.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/wlc_types.h (renamed from drivers/staging/brcm80211/brcmsmac/sys/wlc_types.h) | 0 |
36 files changed, 16 insertions, 17 deletions
diff --git a/drivers/staging/brcm80211/Makefile b/drivers/staging/brcm80211/Makefile index a0695195614f..5caaea597d50 100644 --- a/drivers/staging/brcm80211/Makefile +++ b/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/drivers/staging/brcm80211/brcmfmac/Makefile b/drivers/staging/brcm80211/brcmfmac/Makefile index 13df7c3c79d3..b3931b03f8d7 100644 --- a/drivers/staging/brcm80211/brcmfmac/Makefile +++ b/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/drivers/staging/brcm80211/brcmsmac/Makefile b/drivers/staging/brcm80211/brcmsmac/Makefile index e5dda8689890..ea297023c614 100644 --- a/drivers/staging/brcm80211/brcmsmac/Makefile +++ b/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/drivers/staging/brcm80211/brcmsmac/sys/d11ucode_ext.h b/drivers/staging/brcm80211/brcmsmac/d11ucode_ext.h index c0c0d661e00e..c0c0d661e00e 100644 --- a/drivers/staging/brcm80211/brcmsmac/sys/d11ucode_ext.h +++ b/drivers/staging/brcm80211/brcmsmac/d11ucode_ext.h diff --git a/drivers/staging/brcm80211/brcmsmac/sys/wl_dbg.h b/drivers/staging/brcm80211/brcmsmac/wl_dbg.h index 54af257598c2..54af257598c2 100644 --- a/drivers/staging/brcm80211/brcmsmac/sys/wl_dbg.h +++ b/drivers/staging/brcm80211/brcmsmac/wl_dbg.h diff --git a/drivers/staging/brcm80211/brcmsmac/sys/wl_export.h b/drivers/staging/brcm80211/brcmsmac/wl_export.h index aa8b5a3ed633..aa8b5a3ed633 100644 --- a/drivers/staging/brcm80211/brcmsmac/sys/wl_export.h +++ b/drivers/staging/brcm80211/brcmsmac/wl_export.h diff --git a/drivers/staging/brcm80211/brcmsmac/sys/wl_mac80211.c b/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c index 6bc6207bab3e..6bc6207bab3e 100644 --- a/drivers/staging/brcm80211/brcmsmac/sys/wl_mac80211.c +++ b/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c diff --git a/drivers/staging/brcm80211/brcmsmac/sys/wl_mac80211.h b/drivers/staging/brcm80211/brcmsmac/wl_mac80211.h index bb39b7705947..bb39b7705947 100644 --- a/drivers/staging/brcm80211/brcmsmac/sys/wl_mac80211.h +++ b/drivers/staging/brcm80211/brcmsmac/wl_mac80211.h diff --git a/drivers/staging/brcm80211/brcmsmac/sys/wl_ucode.h b/drivers/staging/brcm80211/brcmsmac/wl_ucode.h index 2a0f4028f6f3..2a0f4028f6f3 100644 --- a/drivers/staging/brcm80211/brcmsmac/sys/wl_ucode.h +++ b/drivers/staging/brcm80211/brcmsmac/wl_ucode.h diff --git a/drivers/staging/brcm80211/brcmsmac/sys/wl_ucode_loader.c b/drivers/staging/brcm80211/brcmsmac/wl_ucode_loader.c index 23e10f3dec0d..23e10f3dec0d 100644 --- a/drivers/staging/brcm80211/brcmsmac/sys/wl_ucode_loader.c +++ b/drivers/staging/brcm80211/brcmsmac/wl_ucode_loader.c diff --git a/drivers/staging/brcm80211/brcmsmac/sys/wlc_alloc.c b/drivers/staging/brcm80211/brcmsmac/wlc_alloc.c index 7a9fdbb5daee..7a9fdbb5daee 100644 --- a/drivers/staging/brcm80211/brcmsmac/sys/wlc_alloc.c +++ b/drivers/staging/brcm80211/brcmsmac/wlc_alloc.c diff --git a/drivers/staging/brcm80211/brcmsmac/sys/wlc_alloc.h b/drivers/staging/brcm80211/brcmsmac/wlc_alloc.h index ac34f782b400..ac34f782b400 100644 --- a/drivers/staging/brcm80211/brcmsmac/sys/wlc_alloc.h +++ b/drivers/staging/brcm80211/brcmsmac/wlc_alloc.h diff --git a/drivers/staging/brcm80211/brcmsmac/sys/wlc_ampdu.c b/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c index 8e1011203481..8e1011203481 100644 --- a/drivers/staging/brcm80211/brcmsmac/sys/wlc_ampdu.c +++ b/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c diff --git a/drivers/staging/brcm80211/brcmsmac/sys/wlc_ampdu.h b/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.h index 03457f63f2ab..03457f63f2ab 100644 --- a/drivers/staging/brcm80211/brcmsmac/sys/wlc_ampdu.h +++ b/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.h diff --git a/drivers/staging/brcm80211/brcmsmac/sys/wlc_antsel.c b/drivers/staging/brcm80211/brcmsmac/wlc_antsel.c index 402ddf8f3371..402ddf8f3371 100644 --- a/drivers/staging/brcm80211/brcmsmac/sys/wlc_antsel.c +++ b/drivers/staging/brcm80211/brcmsmac/wlc_antsel.c diff --git a/drivers/staging/brcm80211/brcmsmac/sys/wlc_antsel.h b/drivers/staging/brcm80211/brcmsmac/wlc_antsel.h index 8875b5848665..8875b5848665 100644 --- a/drivers/staging/brcm80211/brcmsmac/sys/wlc_antsel.h +++ b/drivers/staging/brcm80211/brcmsmac/wlc_antsel.h diff --git a/drivers/staging/brcm80211/brcmsmac/sys/wlc_bmac.c b/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c index e22ce1f79660..e22ce1f79660 100644 --- a/drivers/staging/brcm80211/brcmsmac/sys/wlc_bmac.c +++ b/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c diff --git a/drivers/staging/brcm80211/brcmsmac/sys/wlc_bmac.h b/drivers/staging/brcm80211/brcmsmac/wlc_bmac.h index 03ce9521d652..03ce9521d652 100644 --- a/drivers/staging/brcm80211/brcmsmac/sys/wlc_bmac.h +++ b/drivers/staging/brcm80211/brcmsmac/wlc_bmac.h diff --git a/drivers/staging/brcm80211/brcmsmac/sys/wlc_bsscfg.h b/drivers/staging/brcm80211/brcmsmac/wlc_bsscfg.h index 0bb4a212dd71..0bb4a212dd71 100644 --- a/drivers/staging/brcm80211/brcmsmac/sys/wlc_bsscfg.h +++ b/drivers/staging/brcm80211/brcmsmac/wlc_bsscfg.h diff --git a/drivers/staging/brcm80211/brcmsmac/sys/wlc_cfg.h b/drivers/staging/brcm80211/brcmsmac/wlc_cfg.h index 3decb7d1a5e5..3decb7d1a5e5 100644 --- a/drivers/staging/brcm80211/brcmsmac/sys/wlc_cfg.h +++ b/drivers/staging/brcm80211/brcmsmac/wlc_cfg.h diff --git a/drivers/staging/brcm80211/brcmsmac/sys/wlc_channel.c b/drivers/staging/brcm80211/brcmsmac/wlc_channel.c index a35c15214880..a35c15214880 100644 --- a/drivers/staging/brcm80211/brcmsmac/sys/wlc_channel.c +++ b/drivers/staging/brcm80211/brcmsmac/wlc_channel.c diff --git a/drivers/staging/brcm80211/brcmsmac/sys/wlc_channel.h b/drivers/staging/brcm80211/brcmsmac/wlc_channel.h index 1f170aff68fd..1f170aff68fd 100644 --- a/drivers/staging/brcm80211/brcmsmac/sys/wlc_channel.h +++ b/drivers/staging/brcm80211/brcmsmac/wlc_channel.h diff --git a/drivers/staging/brcm80211/brcmsmac/sys/wlc_event.c b/drivers/staging/brcm80211/brcmsmac/wlc_event.c index 12b156a82ff2..12b156a82ff2 100644 --- a/drivers/staging/brcm80211/brcmsmac/sys/wlc_event.c +++ b/drivers/staging/brcm80211/brcmsmac/wlc_event.c diff --git a/drivers/staging/brcm80211/brcmsmac/sys/wlc_event.h b/drivers/staging/brcm80211/brcmsmac/wlc_event.h index e75582dcdd93..e75582dcdd93 100644 --- a/drivers/staging/brcm80211/brcmsmac/sys/wlc_event.h +++ b/drivers/staging/brcm80211/brcmsmac/wlc_event.h diff --git a/drivers/staging/brcm80211/brcmsmac/sys/wlc_key.h b/drivers/staging/brcm80211/brcmsmac/wlc_key.h index 3e23d5145919..3e23d5145919 100644 --- a/drivers/staging/brcm80211/brcmsmac/sys/wlc_key.h +++ b/drivers/staging/brcm80211/brcmsmac/wlc_key.h diff --git a/drivers/staging/brcm80211/brcmsmac/sys/wlc_mac80211.c b/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c index 5eb41d64bc23..5eb41d64bc23 100644 --- a/drivers/staging/brcm80211/brcmsmac/sys/wlc_mac80211.c +++ b/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c diff --git a/drivers/staging/brcm80211/brcmsmac/sys/wlc_mac80211.h b/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.h index f56b58141c09..f56b58141c09 100644 --- a/drivers/staging/brcm80211/brcmsmac/sys/wlc_mac80211.h +++ b/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.h diff --git a/drivers/staging/brcm80211/brcmsmac/sys/wlc_phy_shim.c b/drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c index 8bd4ede4c92a..8bd4ede4c92a 100644 --- a/drivers/staging/brcm80211/brcmsmac/sys/wlc_phy_shim.c +++ b/drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c diff --git a/drivers/staging/brcm80211/brcmsmac/sys/wlc_phy_shim.h b/drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.h index c151a5d8c693..c151a5d8c693 100644 --- a/drivers/staging/brcm80211/brcmsmac/sys/wlc_phy_shim.h +++ b/drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.h diff --git a/drivers/staging/brcm80211/brcmsmac/sys/wlc_pub.h b/drivers/staging/brcm80211/brcmsmac/wlc_pub.h index 23e99685d548..23e99685d548 100644 --- a/drivers/staging/brcm80211/brcmsmac/sys/wlc_pub.h +++ b/drivers/staging/brcm80211/brcmsmac/wlc_pub.h diff --git a/drivers/staging/brcm80211/brcmsmac/sys/wlc_rate.c b/drivers/staging/brcm80211/brcmsmac/wlc_rate.c index ab7d0bed3c0a..ab7d0bed3c0a 100644 --- a/drivers/staging/brcm80211/brcmsmac/sys/wlc_rate.c +++ b/drivers/staging/brcm80211/brcmsmac/wlc_rate.c diff --git a/drivers/staging/brcm80211/brcmsmac/sys/wlc_rate.h b/drivers/staging/brcm80211/brcmsmac/wlc_rate.h index 25ba2a423639..25ba2a423639 100644 --- a/drivers/staging/brcm80211/brcmsmac/sys/wlc_rate.h +++ b/drivers/staging/brcm80211/brcmsmac/wlc_rate.h diff --git a/drivers/staging/brcm80211/brcmsmac/sys/wlc_scb.h b/drivers/staging/brcm80211/brcmsmac/wlc_scb.h index 142b75674444..142b75674444 100644 --- a/drivers/staging/brcm80211/brcmsmac/sys/wlc_scb.h +++ b/drivers/staging/brcm80211/brcmsmac/wlc_scb.h diff --git a/drivers/staging/brcm80211/brcmsmac/sys/wlc_stf.c b/drivers/staging/brcm80211/brcmsmac/wlc_stf.c index 10c9f447cdf0..10c9f447cdf0 100644 --- a/drivers/staging/brcm80211/brcmsmac/sys/wlc_stf.c +++ b/drivers/staging/brcm80211/brcmsmac/wlc_stf.c diff --git a/drivers/staging/brcm80211/brcmsmac/sys/wlc_stf.h b/drivers/staging/brcm80211/brcmsmac/wlc_stf.h index 8de6382e620d..8de6382e620d 100644 --- a/drivers/staging/brcm80211/brcmsmac/sys/wlc_stf.h +++ b/drivers/staging/brcm80211/brcmsmac/wlc_stf.h diff --git a/drivers/staging/brcm80211/brcmsmac/sys/wlc_types.h b/drivers/staging/brcm80211/brcmsmac/wlc_types.h index df6e04c6ac58..df6e04c6ac58 100644 --- a/drivers/staging/brcm80211/brcmsmac/sys/wlc_types.h +++ b/drivers/staging/brcm80211/brcmsmac/wlc_types.h |