summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/board-generic.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2012-03-05 13:47:28 -0800
committerTony Lindgren <tony@atomide.com>2012-03-05 13:47:28 -0800
commit75a57fe9cb77e3d3062127cb72d18314f00674d1 (patch)
treec90417c7653ffcd62257157445afa70a58125ffb /arch/arm/mach-omap2/board-generic.c
parent428f5ad80118a60a519dcea5ca24d27bae757ff9 (diff)
downloadtalos-obmc-linux-75a57fe9cb77e3d3062127cb72d18314f00674d1.tar.gz
talos-obmc-linux-75a57fe9cb77e3d3062127cb72d18314f00674d1.zip
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.c7
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 @@
#include "common.h"
#include "common-board-devices.h"
+#if !(defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3))
+#define omap_intc_of_init NULL
+#endif
+#ifndef CONFIG_ARCH_OMAP4
+#define gic_of_init NULL
+#endif
+
static struct of_device_id irq_match[] __initdata = {
{ .compatible = "ti,omap2-intc", .data = omap_intc_of_init, },
{ .compatible = "arm,cortex-a9-gic", .data = gic_of_init, },
OpenPOWER on IntegriCloud