diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-29 08:31:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-29 08:31:52 -0700 |
| commit | 0f873d5fb68a6aea9519c9cd613ddf4e7e2378d4 (patch) | |
| tree | 92f98ce0951cb5eec91490fb1ad9e5b0ffe7ca63 /arch/mips/pci/Makefile | |
| parent | df45eddc60e1ab4c81b61e240271eabb4fb176e8 (diff) | |
| parent | ac82da3381fc663dbda31612a0bff60bc41676a3 (diff) | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[SSB] Initialise dma_mask for SSB_BUSTYPE_SSB devices
[MIPS] BCM47xx: Fix build error due to missing PCI functions
[MIPS] IP27: Switch to dynamic interrupt routing avoding panic on error.
[MIPS] au1000: Make sure GPIO value is zero or one
Diffstat (limited to 'arch/mips/pci/Makefile')
| -rw-r--r-- | arch/mips/pci/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/pci/Makefile b/arch/mips/pci/Makefile index 15e01aec37fd..c8c32f417b6c 100644 --- a/arch/mips/pci/Makefile +++ b/arch/mips/pci/Makefile @@ -15,6 +15,7 @@ obj-$(CONFIG_SOC_TX3927) += ops-tx3927.o obj-$(CONFIG_PCI_VR41XX) += ops-vr41xx.o pci-vr41xx.o obj-$(CONFIG_MARKEINS) += ops-emma2rh.o pci-emma2rh.o fixup-emma2rh.o obj-$(CONFIG_PCI_TX4927) += ops-tx4927.o +obj-$(CONFIG_BCM47XX) += pci-bcm47xx.o # # These are still pretty much in the old state, watch, go blind. |