diff options
| author | Joerg Roedel <joro@8bytes.org> | 2013-09-25 12:11:33 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-13 18:14:27 -0700 |
| commit | bbe7602997289ee415a7767150ef6b599d56cf4a (patch) | |
| tree | e0785986f7cfa3d9ec5c849ea490c24a4675e256 /arch | |
| parent | c6bdbcd2f5f55d7f61a61ceee2f342bcfeddbe15 (diff) | |
ARM: mach-integrator: Add stub for pci_v3_early_init() for !CONFIG_PCI
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-integrator/pci_v3.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-integrator/pci_v3.h b/arch/arm/mach-integrator/pci_v3.h index 755fd29fed4a..06a9e2e7d007 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 |