diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-06-08 13:44:21 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-06-08 13:44:21 -0400 |
| commit | c0c33addcba2ce753b4e2746db99feaae2f82a85 (patch) | |
| tree | dab480183ac0e64bfe9250e1f294705d1a424c78 /drivers/bcma/Makefile | |
| parent | ffbc03bc75b39c7bd412e7cc6d2185c11b0ffedd (diff) | |
| parent | 931749bf78b969c54de9bbc67cf29b13a40bb73b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Diffstat (limited to 'drivers/bcma/Makefile')
| -rw-r--r-- | drivers/bcma/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/bcma/Makefile b/drivers/bcma/Makefile index 0d56245bcb79..cde0182bd1dc 100644 --- a/drivers/bcma/Makefile +++ b/drivers/bcma/Makefile @@ -1,4 +1,4 @@ -bcma-y += main.o scan.o core.o +bcma-y += main.o scan.o core.o sprom.o bcma-y += driver_chipcommon.o driver_chipcommon_pmu.o bcma-y += driver_pci.o bcma-$(CONFIG_BCMA_HOST_PCI) += host_pci.o |