Thread (3 messages) 3 messages, 3 authors, 2013-09-26
STALE4666d REVIEWED: 1 (0M)

[PATCH] arm: mach-integrator: Add stub for pci_v3_early_init() for !CONFIG_PCI

From: joro@8bytes.org (Joerg Roedel)
Date: 2013-09-25 10:11:45
Also in: lkml, stable
Subsystem: arm port, the rest · Maintainers: Russell King, Linus Torvalds

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 at vger.kernel.org
Reviewed-by: Linus Walleij <redacted>
Signed-off-by: Joerg Roedel <joro@8bytes.org>
---
 arch/arm/mach-integrator/pci_v3.h |    7 +++++++
 1 file changed, 7 insertions(+)
diff --git a/arch/arm/mach-integrator/pci_v3.h b/arch/arm/mach-integrator/pci_v3.h
index 755fd29..06a9e2e 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
-- 
1.7.9.5
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help