diff options
| author | Olof Johansson <olof@lixom.net> | 2011-12-19 21:12:47 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2011-12-19 21:12:53 -0800 |
| commit | 4b3ee30b5201ddeefdc56ad32b6bbc1fab8b084a (patch) | |
| tree | 0ac643f1a0c57a88452ef017c61d325fab98d00a /arch/arm/mach-omap2/board-am3517evm.c | |
| parent | f68453e076dcf140c4a7bdd385f239b1e41be983 (diff) | |
| parent | 1b46f8782c2607afa1298b0c7f7fe307fc0f7a5b (diff) | |
Merge branch 'picoxcell/devel' into next/devel
* picoxcell/devel: (1 commit)
ARM: picoxcell: implement watchdog restart
Diffstat (limited to 'arch/arm/mach-omap2/board-am3517evm.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-am3517evm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-am3517evm.c b/arch/arm/mach-omap2/board-am3517evm.c index d314f033c9df..551cae8d9b8a 100644 --- a/arch/arm/mach-omap2/board-am3517evm.c +++ b/arch/arm/mach-omap2/board-am3517evm.c @@ -32,7 +32,7 @@ #include <asm/mach/map.h> #include <plat/board.h> -#include <plat/common.h> +#include "common.h" #include <plat/usb.h> #include <video/omapdss.h> #include <video/omap-panel-generic-dpi.h> @@ -491,6 +491,7 @@ MACHINE_START(OMAP3517EVM, "OMAP3517/AM3517 EVM") .map_io = omap3_map_io, .init_early = am35xx_init_early, .init_irq = omap3_init_irq, + .handle_irq = omap3_intc_handle_irq, .init_machine = am3517_evm_init, .timer = &omap3_timer, MACHINE_END |