diff options
author | Tony Lindgren <tony@atomide.com> | 2012-03-05 16:47:28 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-03-05 16:47:28 -0500 |
commit | 75a57fe9cb77e3d3062127cb72d18314f00674d1 (patch) | |
tree | c90417c7653ffcd62257157445afa70a58125ffb /arch/arm/mach-omap2/board-generic.c | |
parent | 428f5ad80118a60a519dcea5ca24d27bae757ff9 (diff) |
ARM: OMAP2+: Fix build error when only ARCH_OMAP2/3 or 4 is selected
Otherwise we'll get undefined reference to `gic_of_init' or
undefined reference to `omap_intc_of_init'.
This was caused by commit fbf75da733e82bb17a01e1b907b0e40d9c028823
(ARM: OMAP2+: board-generic: Use of_irq_init API).
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/board-generic.c')
-rw-r--r-- | arch/arm/mach-omap2/board-generic.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c index 12f4c5ff23bb..25d195ff1cb1 100644 --- a/arch/arm/mach-omap2/board-generic.c +++ b/arch/arm/mach-omap2/board-generic.c | |||
@@ -25,6 +25,13 @@ | |||
25 | #include "common.h" | 25 | #include "common.h" |
26 | #include "common-board-devices.h" | 26 | #include "common-board-devices.h" |
27 | 27 | ||
28 | #if !(defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)) | ||
29 | #define omap_intc_of_init NULL | ||
30 | #endif | ||
31 | #ifndef CONFIG_ARCH_OMAP4 | ||
32 | #define gic_of_init NULL | ||
33 | #endif | ||
34 | |||
28 | static struct of_device_id irq_match[] __initdata = { | 35 | static struct of_device_id irq_match[] __initdata = { |
29 | { .compatible = "ti,omap2-intc", .data = omap_intc_of_init, }, | 36 | { .compatible = "ti,omap2-intc", .data = omap_intc_of_init, }, |
30 | { .compatible = "arm,cortex-a9-gic", .data = gic_of_init, }, | 37 | { .compatible = "arm,cortex-a9-gic", .data = gic_of_init, }, |