diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-05-16 22:10:14 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-05-16 22:10:14 +0200 |
| commit | 820f3dd7964f1889baaaaa0c2ba45d05bb619f66 (patch) | |
| tree | bea4928108e9e03f68bd07217877722caabaac2b | |
| parent | 6d49d53552b60be2caaa853c814662bc4e24428e (diff) | |
| download | olio-linux-3.10-820f3dd7964f1889baaaaa0c2ba45d05bb619f66.tar.xz olio-linux-3.10-820f3dd7964f1889baaaaa0c2ba45d05bb619f66.zip | |
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.c | 6 |
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) 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); } } |