diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-17 21:16:55 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-17 21:16:55 -0400 |
| commit | 4b337c5f245b6587ba844ac7bb13c313a2912f7b (patch) | |
| tree | 999c6a6580b76a083c8efb9dabff709d1c49fcd0 /arch/mips/cavium-octeon/Makefile | |
| parent | 492b057c426e4aa747484958e18e9da29003985d (diff) | |
| parent | 3fe0344faf7fdcb158bd5c1a9aec960a8d70c8e8 (diff) | |
Merge commit 'origin/master' into next
Diffstat (limited to 'arch/mips/cavium-octeon/Makefile')
| -rw-r--r-- | arch/mips/cavium-octeon/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/mips/cavium-octeon/Makefile b/arch/mips/cavium-octeon/Makefile index d6903c3f3d51..7c0528b0e34c 100644 --- a/arch/mips/cavium-octeon/Makefile +++ b/arch/mips/cavium-octeon/Makefile | |||
| @@ -14,5 +14,9 @@ obj-y += dma-octeon.o flash_setup.o | |||
| 14 | obj-y += octeon-memcpy.o | 14 | obj-y += octeon-memcpy.o |
| 15 | 15 | ||
| 16 | obj-$(CONFIG_SMP) += smp.o | 16 | obj-$(CONFIG_SMP) += smp.o |
| 17 | obj-$(CONFIG_PCI) += pci-common.o | ||
| 18 | obj-$(CONFIG_PCI) += pci.o | ||
| 19 | obj-$(CONFIG_PCI) += pcie.o | ||
| 20 | obj-$(CONFIG_PCI_MSI) += msi.o | ||
| 17 | 21 | ||
| 18 | EXTRA_CFLAGS += -Werror | 22 | EXTRA_CFLAGS += -Werror |