diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-07-20 18:30:48 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-07-20 18:30:48 +0200 |
| commit | 90b90f60c4f8e3a8525dfeb4aec46a9c7a29c857 (patch) | |
| tree | 9b1d8ca6084012a02b302520bc26e5be65ba7b2a /drivers/bcma/Makefile | |
| parent | Merge branch 'net' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/... (diff) | |
| parent | libertas: firmware.c: remove duplicated include (diff) | |
| download | linux-90b90f60c4f8e3a8525dfeb4aec46a9c7a29c857.tar.xz linux-90b90f60c4f8e3a8525dfeb4aec46a9c7a29c857.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'drivers/bcma/Makefile')
| -rw-r--r-- | drivers/bcma/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/bcma/Makefile b/drivers/bcma/Makefile index 82de24e5340c..8ad42d41b2f2 100644 --- a/drivers/bcma/Makefile +++ b/drivers/bcma/Makefile @@ -1,8 +1,11 @@ bcma-y += main.o scan.o core.o sprom.o bcma-y += driver_chipcommon.o driver_chipcommon_pmu.o +bcma-$(CONFIG_BCMA_SFLASH) += driver_chipcommon_sflash.o +bcma-$(CONFIG_BCMA_NFLASH) += driver_chipcommon_nflash.o bcma-y += driver_pci.o bcma-$(CONFIG_BCMA_DRIVER_PCI_HOSTMODE) += driver_pci_host.o bcma-$(CONFIG_BCMA_DRIVER_MIPS) += driver_mips.o +bcma-$(CONFIG_BCMA_DRIVER_GMAC_CMN) += driver_gmac_cmn.o bcma-$(CONFIG_BCMA_HOST_PCI) += host_pci.o bcma-$(CONFIG_BCMA_HOST_SOC) += host_soc.o obj-$(CONFIG_BCMA) += bcma.o |