Skip to contentSkip to conversation

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

PATCH In review Joerg Roedel 3 participants 3 messages Sep 25, 2013 – Sep 26, 2013

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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 at vger.kernel.org
---
 arch/arm/mach-integrator/pci_v3.h |    7 +++++++
 1 file changed, 7 insertions(+)
arch/arm/mach-integrator/pci_v3.h +7 -0
index 755fd29..06a9e2e 100644
@@ -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
Signature · 1 line
1.7.9.5
#1 lore raw
Quoted 1 line · Joerg Roedel

This fixes a compile error where CONFIG_PCI is disabled:

ARM SoC folks, can you please apply this directly for fixes?

Yours,
Linus Walleij

#2 lore raw
Quoted 5 lines · Linus Walleij
Quoted 1 line · Joerg Roedel

This fixes a compile error where CONFIG_PCI is disabled:

ARM SoC folks, can you please apply this directly for fixes?

Done!

Thanks,

-Olof