summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorJoerg Roedel <joro@8bytes.org>2013-09-25 12:11:33 +0200
committerOlof Johansson <olof@lixom.net>2013-09-25 21:59:52 -0700
commit4dc3231f818baf7415c67ee06c51ace0973ae736 (patch)
tree967397e99940d4b5fb2ca81abcb63b3df7eeb4cc /arch/arm
parent66583ec75570b33edcec27e40941b4235189b3d8 (diff)
ARM: mach-integrator: Add stub for pci_v3_early_init() for !CONFIG_PCI
This fixes a compile error where CONFIG_PCI is disabled: LD init/built-in.o arch/arm/mach-integrator/built-in.o: In function `ap_map_io': integrator_cp.c:(.init.text+0x570): undefined reference to `pci_v3_early_init' make[1]: *** [vmlinux] Error 1 make: *** [sub-make] Error 2 Cc: stable@vger.kernel.org Signed-off-by: Joerg Roedel <joro@8bytes.org> Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-integrator/pci_v3.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-integrator/pci_v3.h b/arch/arm/mach-integrator/pci_v3.h
index 755fd29fed4a..06a9e2e7d007 100644
--- a/arch/arm/mach-integrator/pci_v3.h
+++ b/arch/arm/mach-integrator/pci_v3.h
@@ -1,2 +1,9 @@
/* Simple oneliner include to the PCIv3 early init */
+#ifdef CONFIG_PCI
extern int pci_v3_early_init(void);
+#else
+static inline int pci_v3_early_init(void)
+{
+ return 0;
+}
+#endif