diff options
| author |   John W. Linville <linville@tuxdriver.com> | 2012-11-28 10:56:03 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-11-28 10:56:03 -0500 |
| commit | 79d38f7d6cf545ff838dd5227869f3916d1d100d (patch) | |
| tree | 859c8071aab68fd32f36ffb9ebc04cf12db6e5e0 /drivers/net/wireless/brcm80211/brcmfmac/Makefile | |
| parent | ip6mr: Add sizeof verification to MRT6_ASSERT and MT6_PIM (diff) | |
| parent | bcma: add more package IDs (diff) | |
| download | linux-dev-79d38f7d6cf545ff838dd5227869f3916d1d100d.tar.xz linux-dev-79d38f7d6cf545ff838dd5227869f3916d1d100d.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
drivers/net/wireless/iwlwifi/pcie/tx.c
Diffstat (limited to 'drivers/net/wireless/brcm80211/brcmfmac/Makefile')
| -rw-r--r-- | drivers/net/wireless/brcm80211/brcmfmac/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/Makefile b/drivers/net/wireless/brcm80211/brcmfmac/Makefile index fe80b637c519..1a6661a9f008 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/Makefile +++ b/drivers/net/wireless/brcm80211/brcmfmac/Makefile @@ -25,6 +25,7 @@ obj-$(CONFIG_BRCMFMAC) += brcmfmac.o brcmfmac-objs += \ wl_cfg80211.o \ fwil.o \ + fweh.o \ dhd_cdc.o \ dhd_common.o \ dhd_linux.o |