summaryrefslogtreecommitdiff
path: root/drivers/staging/brcm80211/brcmfmac/Makefile
diff options
context:
space:
mode:
authorHenry Ptasinski <henryp@broadcom.com>2010-09-26 13:19:44 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2010-09-26 18:23:57 -0700
commit6afd1198d111ccff4c91be96d8c631afc29325e7 (patch)
tree09aa30bd0b57628eb4cd7b44a4584b349f9bd6b8 /drivers/staging/brcm80211/brcmfmac/Makefile
parent76a3ccabf25bc3a52c3377bfdfc3ecc16499180b (diff)
downloadlinux-6afd1198d111ccff4c91be96d8c631afc29325e7.tar.gz
staging: brcm80211: Make compiling of brcm80211.ko and brcmfmac.ko mutually exclusive.
Temporary fix until utils get cleaned up. Signed-off-by: Henry Ptasinski <henryp@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/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/staging/brcm80211/brcmfmac/Makefile b/drivers/staging/brcm80211/brcmfmac/Makefile
index 09196e9789e5..b0bfd5ed8e14 100644
--- a/drivers/staging/brcm80211/brcmfmac/Makefile
+++ b/drivers/staging/brcm80211/brcmfmac/Makefile
@@ -56,6 +56,7 @@ DHDOFILES = dhd_linux.o linux_osl.o bcmutils.o dhd_common.o dhd_custom_gpio.o \
dhd_linux_sched.o dhd_cdc.o bcmsdh_sdmmc.o bcmsdh.o bcmsdh_linux.o \
bcmsdh_sdmmc_linux.o
-obj-$(CONFIG_BRCMFMAC) += brcmfmac.o
+#obj-$(CONFIG_BRCMFMAC) += brcmfmac.o
+obj-m += brcmfmac.o
brcmfmac-objs += $(DHDOFILES)
EXTRA_LDFLAGS += --strip-debug