summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/Makefile
diff options
context:
space:
mode:
authorArend van Spriel <arend@broadcom.com>2011-10-05 13:19:03 +0200
committerJohn W. Linville <linville@tuxdriver.com>2011-10-11 21:55:30 +0200
commit5b435de0d786869c95d1962121af0d7df2542009 (patch)
tree9b7cfbc4aa9f1ec0e719e3a0c677bd9f4e56540d /drivers/net/wireless/Makefile
parentath6kl: fixup merge damage in ath6kl_mgmt_tx (diff)
downloadlinux-5b435de0d786869c95d1962121af0d7df2542009.tar.xz
linux-5b435de0d786869c95d1962121af0d7df2542009.zip
net: wireless: add brcm80211 drivers
Add the brcm80211 tree to drivers/net/wireless, and disable the version that's in drivers/staging. This version includes the sources currently in staging, plus any changes that have been sent out for review. Sources in staging will be deleted in a followup patch. Signed-off-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/Makefile')
-rw-r--r--drivers/net/wireless/Makefile3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
index 4cf0ad312da1..0a304b060b6c 100644
--- a/drivers/net/wireless/Makefile
+++ b/drivers/net/wireless/Makefile
@@ -58,3 +58,6 @@ obj-$(CONFIG_WL12XX_PLATFORM_DATA) += wl12xx/
obj-$(CONFIG_IWM) += iwmc3200wifi/
obj-$(CONFIG_MWIFIEX) += mwifiex/
+obj-$(CONFIG_BRCMFMAC) += brcm80211/
+obj-$(CONFIG_BRCMUMAC) += brcm80211/
+obj-$(CONFIG_BRCMSMAC) += brcm80211/