diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-02-07 20:57:41 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-02-07 20:57:41 -0800 |
| commit | 2416dc85107bf862acde82ffb8b0c86193487fd5 (patch) | |
| tree | 465c0cd18c9d7ca06eca8cc543966ed3c1b50454 | |
| parent | 62aa2b537c6f5957afd98e29f96897419ed5ebab (diff) | |
| parent | b755706cd726e5d465c28c2cd64c618419034981 (diff) | |
| download | linux-stable-2416dc85107bf862acde82ffb8b0c86193487fd5.tar.gz linux-stable-2416dc85107bf862acde82ffb8b0c86193487fd5.tar.bz2 linux-stable-2416dc85107bf862acde82ffb8b0c86193487fd5.zip | |
Merge branch 'fixes-dt' into fixes
| -rw-r--r-- | arch/arm/mach-omap2/board-generic.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c index d58756060483..ad497620539b 100644 --- a/arch/arm/mach-omap2/board-generic.c +++ b/arch/arm/mach-omap2/board-generic.c @@ -17,6 +17,7 @@ #include <linux/i2c/twl.h> #include <mach/hardware.h> +#include <asm/hardware/gic.h> #include <asm/mach/arch.h> #include <plat/board.h> @@ -102,6 +103,7 @@ DT_MACHINE_START(OMAP242X_DT, "Generic OMAP2420 (Flattened Device Tree)") .map_io = omap242x_map_io, .init_early = omap2420_init_early, .init_irq = omap2_init_irq, + .handle_irq = omap2_intc_handle_irq, .init_machine = omap_generic_init, .timer = &omap2_timer, .dt_compat = omap242x_boards_compat, @@ -141,6 +143,7 @@ DT_MACHINE_START(OMAP3_DT, "Generic OMAP3 (Flattened Device Tree)") .map_io = omap3_map_io, .init_early = omap3430_init_early, .init_irq = omap3_init_irq, + .handle_irq = omap3_intc_handle_irq, .init_machine = omap3_init, .timer = &omap3_timer, .dt_compat = omap3_boards_compat, @@ -160,6 +163,7 @@ DT_MACHINE_START(OMAP4_DT, "Generic OMAP4 (Flattened Device Tree)") .map_io = omap4_map_io, .init_early = omap4430_init_early, .init_irq = gic_init_irq, + .handle_irq = gic_handle_irq, .init_machine = omap4_init, .timer = &omap4_timer, .dt_compat = omap4_boards_compat, |