ARM: exynos: fix building with CONFIG_OF disabled

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-exynos / common.c

diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c
index 9900158f026a7f8f2efc7cd375ac04d904f7224f..49134711f4c6a446a54c432748f5ccece37e2401 100644 (file)
--- a/arch/arm/mach-exynos/common.c
+++ b/arch/arm/mach-exynos/common.c
@@ -568,7 +568,11 @@ void __init combiner_init(void __iomem *combiner_base, struct device_node *np)
 
        for (i = 0; i < max_nr; i++) {
                combiner_init_one(i, combiner_base + (i >> 2) * 0x10);
-               irq = np ? irq_of_parse_and_map(np, i) : IRQ_SPI(i);
+               irq = IRQ_SPI(i);
+#ifdef CONFIG_OF
+               if (np)
+                       irq = irq_of_parse_and_map(np, i);
+#endif
                combiner_cascade_irq(i, irq);
        }
 }