diff mbox

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

Message ID 1380103893-7119-1-git-send-email-joro@8bytes.org (mailing list archive)
State New, archived
Headers show

Commit Message

Joerg Roedel Sept. 25, 2013, 10:11 a.m. UTC 
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
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Joerg Roedel <joro@8bytes.org>
---
 arch/arm/mach-integrator/pci_v3.h |    7 +++++++
 1 file changed, 7 insertions(+)

Comments

Linus Walleij Sept. 25, 2013, 1:39 p.m. UTC | #1 
On Wed, Sep 25, 2013 at 12:11 PM, Joerg Roedel <joro@8bytes.org> wrote:

> This fixes a compile error where CONFIG_PCI is disabled:

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

Yours,
Linus Walleij
Olof Johansson Sept. 26, 2013, 5:02 a.m. UTC | #2 
On Wed, Sep 25, 2013 at 6:39 AM, Linus Walleij <linus.walleij@linaro.org> wrote:
> On Wed, Sep 25, 2013 at 12:11 PM, Joerg Roedel <joro@8bytes.org> wrote:
>
>> This fixes a compile error where CONFIG_PCI is disabled:
>
> ARM SoC folks, can you please apply this directly for fixes?

Done!

Thanks,

-Olof
diff mbox

Patch

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