* [PATCH] arm: mach-integrator: Add stub for pci_v3_early_init() for !CONFIG_PCI
@ 2013-09-25 10:11 Joerg Roedel
2013-09-25 13:39 ` Linus Walleij
0 siblings, 1 reply; 3+ messages in thread
From: Joerg Roedel @ 2013-09-25 10:11 UTC (permalink / raw)
To: arm, Russell King, Linus Walleij, Arnd Bergmann
Cc: linux-arm-kernel, linux-kernel, Joerg Roedel, stable
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(+)
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] arm: mach-integrator: Add stub for pci_v3_early_init() for !CONFIG_PCI
2013-09-25 10:11 [PATCH] arm: mach-integrator: Add stub for pci_v3_early_init() for !CONFIG_PCI Joerg Roedel
@ 2013-09-25 13:39 ` Linus Walleij
2013-09-26 5:02 ` Olof Johansson
0 siblings, 1 reply; 3+ messages in thread
From: Linus Walleij @ 2013-09-25 13:39 UTC (permalink / raw)
To: Joerg Roedel, arm
Cc: Russell King, Arnd Bergmann, linux-arm-kernel, linux-kernel, stable
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] arm: mach-integrator: Add stub for pci_v3_early_init() for !CONFIG_PCI
2013-09-25 13:39 ` Linus Walleij
@ 2013-09-26 5:02 ` Olof Johansson
0 siblings, 0 replies; 3+ messages in thread
From: Olof Johansson @ 2013-09-26 5:02 UTC (permalink / raw)
To: Linus Walleij
Cc: Joerg Roedel, arm, Russell King, Arnd Bergmann, linux-arm-kernel,
linux-kernel, stable
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-09-26 5:02 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-09-25 10:11 [PATCH] arm: mach-integrator: Add stub for pci_v3_early_init() for !CONFIG_PCI Joerg Roedel
2013-09-25 13:39 ` Linus Walleij
2013-09-26 5:02 ` Olof Johansson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).