Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8941ea6 authored by Arend van Spriel's avatar Arend van Spriel Committed by Greg Kroah-Hartman
Browse files

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: default avatarBrett Rudley <brudley@broadcom.com>
Reviewed-by: default avatarHenry Ptasinski <henryp@broadcom.com>
Reviewed-by: default avatarRoland Vossen <rvossen@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 5e72615c

drivers/staging/brcm80211/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -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/

drivers/staging/brcm80211/brcmfmac/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -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)

drivers/staging/brcm80211/brcmsmac/Makefile

+13 −15
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.



ccflags-y :=					\

	-DBCMDBG				\

	-DWLC_HIGH				\

	-DWLC_LOW				\

	-DSTA					\
@@ -26,24 +25,23 @@ ccflags-y := \ 
	-DBCMDMA32				\

	-DBCMNVRAMR				\

	-Idrivers/staging/brcm80211/brcmsmac \

	-Idrivers/staging/brcm80211/brcmsmac/sys \

	-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 \