]> Pileus Git - ~andy/linux/commitdiff
ARM: mach-integrator: Add stub for pci_v3_early_init() for !CONFIG_PCI
authorJoerg Roedel <joro@8bytes.org>
Wed, 25 Sep 2013 10:11:33 +0000 (12:11 +0200)
committerOlof Johansson <olof@lixom.net>
Thu, 26 Sep 2013 04:59:52 +0000 (21:59 -0700)
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>
arch/arm/mach-integrator/pci_v3.h

index 755fd29fed4a5f407ed3107abb4154637bdf5228..06a9e2e7d007b847f650b8efbf0856a1f47978ae 100644 (file)
@@ -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