aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-05-16 16:10:14 -0400
committerArnd Bergmann <arnd@arndb.de>2012-05-16 16:10:14 -0400
commit820f3dd7964f1889baaaaa0c2ba45d05bb619f66 (patch)
treebea4928108e9e03f68bd07217877722caabaac2b
parent6d49d53552b60be2caaa853c814662bc4e24428e (diff)
ARM: exynos: fix building with CONFIG_OF disabled
irq_of_parse_and_map does not have an empty definition for the !CONFIG_OF case, so we should not try to call it then: arch/arm/mach-exynos/common.c: In function 'combiner_init': arch/arm/mach-exynos/common.c:576:3: warning: implicit declaration of function 'irq_of_parse_and_map' Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r--arch/arm/mach-exynos/common.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c
index 9900158f026..49134711f4c 100644
--- 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)
568 568
569 for (i = 0; i < max_nr; i++) { 569 for (i = 0; i < max_nr; i++) {
570 combiner_init_one(i, combiner_base + (i >> 2) * 0x10); 570 combiner_init_one(i, combiner_base + (i >> 2) * 0x10);
571 irq = np ? irq_of_parse_and_map(np, i) : IRQ_SPI(i); 571 irq = IRQ_SPI(i);
572#ifdef CONFIG_OF
573 if (np)
574 irq = irq_of_parse_and_map(np, i);
575#endif
572 combiner_cascade_irq(i, irq); 576 combiner_cascade_irq(i, irq);
573 } 577 }
574} 578}