]> Pileus Git - ~andy/linux/commitdiff
ARM: OMAP2+: Fix build error when only ARCH_OMAP2/3 or 4 is selected
authorTony Lindgren <tony@atomide.com>
Mon, 5 Mar 2012 21:47:28 +0000 (13:47 -0800)
committerTony Lindgren <tony@atomide.com>
Mon, 5 Mar 2012 21:47:28 +0000 (13:47 -0800)
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>
arch/arm/mach-omap2/board-generic.c

index 12f4c5ff23bb81a116fdb026911926698bcaf4e8..25d195ff1cb1d151a48dacf5a5786da07b067ad0 100644 (file)
 #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, },