aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2014-03-15 06:27:28 -0400
committerArnd Bergmann <arnd@arndb.de>2014-03-21 13:26:09 -0400
commit570977a1fc5d4c1ade5107c03336b0845aed7005 (patch)
treed2589c0f121f77a8fb826b49d9de35b36be53271
parentad9faf4c4cb375550d0b1acad604f7b8755563d7 (diff)
ARM: footbridge: fix build with PCI disabled
The dc21285.c source file cannot be built when CONFIG_PCI is disabled, because it calls a number of PCI core interfaces. This changes the Makefile so we don't include this file in the build if CONFIG_PCI is disabled. No other code references anything defined inside of this file in this case. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Cc: Russell King <linux@arm.linux.org.uk>
-rw-r--r--arch/arm/mach-footbridge/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-footbridge/Makefile b/arch/arm/mach-footbridge/Makefile
index 0b64dd430d61..c3faa3bc84dd 100644
--- a/arch/arm/mach-footbridge/Makefile
+++ b/arch/arm/mach-footbridge/Makefile
@@ -4,11 +4,12 @@
4 4
5# Object file lists. 5# Object file lists.
6 6
7obj-y := common.o dc21285.o dma.o isa-irq.o 7obj-y := common.o dma.o isa-irq.o
8obj-m := 8obj-m :=
9obj-n := 9obj-n :=
10obj- := 10obj- :=
11 11
12pci-y += dc21285.o
12pci-$(CONFIG_ARCH_CATS) += cats-pci.o 13pci-$(CONFIG_ARCH_CATS) += cats-pci.o
13pci-$(CONFIG_ARCH_EBSA285_HOST) += ebsa285-pci.o 14pci-$(CONFIG_ARCH_EBSA285_HOST) += ebsa285-pci.o
14pci-$(CONFIG_ARCH_NETWINDER) += netwinder-pci.o 15pci-$(CONFIG_ARCH_NETWINDER) += netwinder-pci.o