Merge git://git.infradead.org/iommu-2.6 into iommu/fixes

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-ks8695 / board-og.c

diff --git a/arch/arm/mach-ks8695/board-og.c b/arch/arm/mach-ks8695/board-og.c
index 002bc619bb686538eb06e0a6b9bc32abd3320c8d..f2658168eeff0d34072b2b1498881ded9aca766a 100644 (file)
--- 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);
 }
 
 /*