diff options
| author | Olof Johansson <olof@lixom.net> | 2011-12-17 02:50:01 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2011-12-17 02:50:01 +0400 |
| commit | b94ee062b5b41c7fc0e44309e8546d4694e75007 (patch) | |
| tree | 2ba08003be8d25a573c17a00a627b424de4bb2e4 /arch/arm/mach-omap2/board-apollon.c | |
| parent | dc47ce90c3a822cd7c9e9339fe4d5f61dcb26b50 (diff) | |
| parent | 3bdc3484e8f2b1b219ad0397d81ce4601fbaf76d (diff) | |
| download | linux-b94ee062b5b41c7fc0e44309e8546d4694e75007.tar.xz | |
Merge branch 'depends/rmk/devel-stable' into next/boards
Diffstat (limited to 'arch/arm/mach-omap2/board-apollon.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-apollon.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-apollon.c b/arch/arm/mach-omap2/board-apollon.c index de8134b7f580..5a66480feed0 100644 --- a/arch/arm/mach-omap2/board-apollon.c +++ b/arch/arm/mach-omap2/board-apollon.c @@ -37,7 +37,7 @@ #include <plat/led.h> #include <plat/usb.h> #include <plat/board.h> -#include <plat/common.h> +#include "common.h" #include <plat/gpmc.h> #include <video/omapdss.h> @@ -354,6 +354,7 @@ MACHINE_START(OMAP_APOLLON, "OMAP24xx Apollon") .map_io = omap242x_map_io, .init_early = omap2420_init_early, .init_irq = omap2_init_irq, + .handle_irq = omap2_intc_handle_irq, .init_machine = omap_apollon_init, .timer = &omap2_timer, MACHINE_END |