diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-03-15 11:34:55 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-03-21 18:23:28 +0100 |
| commit | de94abfa0f6e9b1b58863e85929e727b118df2f1 (patch) | |
| tree | bb3d9d14063b2ed25b1554cd21521adb7cc54289 /arch/arm/mach-ks8695 | |
| parent | 48ba81f6fdb7580a5c474da1b14a338e1358e6ab (diff) | |
| download | op-kernel-dev-de94abfa0f6e9b1b58863e85929e727b118df2f1.zip op-kernel-dev-de94abfa0f6e9b1b58863e85929e727b118df2f1.tar.gz | |
ARM: ks8695/og: make PCI setup conditional
The 'og' machine tries to always initialized the PCI code, but that
may be disabled in Kconfig, leading to a build error.
This patch changes the code to use the same Kconfig symbol to decide
about calling the ks8695_init_pci function at build time that we
use to decide about building the ks8695 PCI support.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Greg Ungerer <gerg@uclinux.org>
Diffstat (limited to 'arch/arm/mach-ks8695')
| -rw-r--r-- | arch/arm/mach-ks8695/board-og.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-ks8695/board-og.c b/arch/arm/mach-ks8695/board-og.c index 002bc61..f265816 100644 --- a/arch/arm/mach-ks8695/board-og.c +++ b/arch/arm/mach-ks8695/board-og.c @@ -44,7 +44,8 @@ static void __init og_register_pci(void) if (machine_is_im4004()) ks8695_gpio_interrupt(KS8695_GPIO_1, IRQ_TYPE_LEVEL_LOW); - ks8695_init_pci(&og_pci); + if (IS_ENABLED(CONFIG_PCI)) + ks8695_init_pci(&og_pci); } /* |
