diff options
author | Arend van Spriel <arend@broadcom.com> | 2011-01-25 16:53:39 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-04 13:29:10 -0800 |
commit | 2ea0f6fa6570f6271909fee852474414ba04679d (patch) | |
tree | ff43eebc1a5e62e29411b4f21595ea3f2f8b8e09 /drivers/staging/brcm80211/brcmfmac/Makefile | |
parent | 8a6257fbd8af8105149c15f0af91e8355bd51034 (diff) | |
download | linux-2ea0f6fa6570f6271909fee852474414ba04679d.tar.gz |
staging: brcm80211: allow both driver are created in single build
This patch allows to build both drivers. Previous patch for this
failed using -j option. This has been fixed by adding files with
include statement for the fullmac driver. Verified this is working
using -j4 option.
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/brcm80211/brcmfmac/Makefile')
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/Makefile | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/drivers/staging/brcm80211/brcmfmac/Makefile b/drivers/staging/brcm80211/brcmfmac/Makefile index b3931b03f8d7..040f4a72dad8 100644 --- a/drivers/staging/brcm80211/brcmfmac/Makefile +++ b/drivers/staging/brcm80211/brcmfmac/Makefile @@ -22,7 +22,6 @@ ccflags-y := \ -DBCMSDIO \ -DBDC \ -DBRCM_FULLMAC \ - -DDHD_DEBUG \ -DDHD_FIRSTREAD=64 \ -DDHD_SCHED \ -DDHD_SDALIGN=64 \ @@ -31,8 +30,12 @@ ccflags-y := \ -DMMC_SDIO_ABORT \ -DPKT_FILTER_SUPPORT \ -DSHOW_EVENTS \ - -DTOE \ - -Idrivers/staging/brcm80211/brcmfmac \ + -DTOE + +ccflags-$(CONFIG_BRCMDBG) += -DDHD_DEBUG + +ccflags-y += \ + -Idrivers/staging/brcm80211/brcmfmac \ -Idrivers/staging/brcm80211/include \ -Idrivers/staging/brcm80211/util @@ -49,13 +52,13 @@ DHDOFILES = \ bcmsdh_linux.o \ bcmsdh_sdmmc.o \ bcmsdh_sdmmc_linux.o \ - ../util/linux_osl.o \ - ../util/aiutils.o \ - ../util/siutils.o \ - ../util/sbutils.o \ - ../util/bcmutils.o \ - ../util/bcmwifi.o \ - ../util/hndpmu.o + linux_osl.o \ + aiutils.o \ + siutils.o \ + sbutils.o \ + bcmutils.o \ + bcmwifi.o \ + hndpmu.o obj-m += brcmfmac.o brcmfmac-objs += $(DHDOFILES) |