| From 4dc3231f818baf7415c67ee06c51ace0973ae736 Mon Sep 17 00:00:00 2001 |
| From: Joerg Roedel <joro@8bytes.org> |
| Date: Wed, 25 Sep 2013 12:11:33 +0200 |
| Subject: ARM: mach-integrator: Add stub for pci_v3_early_init() for !CONFIG_PCI |
| |
| From: Joerg Roedel <joro@8bytes.org> |
| |
| commit 4dc3231f818baf7415c67ee06c51ace0973ae736 upstream. |
| |
| 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 |
| |
| Signed-off-by: Joerg Roedel <joro@8bytes.org> |
| Reviewed-by: Linus Walleij <linus.walleij@linaro.org> |
| Signed-off-by: Olof Johansson <olof@lixom.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| arch/arm/mach-integrator/pci_v3.h | 7 +++++++ |
| 1 file changed, 7 insertions(+) |
| |
| --- 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 |