diff options
author | Olof Johansson <olof@lixom.net> | 2011-12-20 05:12:47 (GMT) |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2011-12-20 05:12:53 (GMT) |
commit | 4b3ee30b5201ddeefdc56ad32b6bbc1fab8b084a (patch) | |
tree | 0ac643f1a0c57a88452ef017c61d325fab98d00a /arch/arm/mach-omap2/board-omap3beagle.c | |
parent | f68453e076dcf140c4a7bdd385f239b1e41be983 (diff) | |
parent | 1b46f8782c2607afa1298b0c7f7fe307fc0f7a5b (diff) | |
download | linux-4b3ee30b5201ddeefdc56ad32b6bbc1fab8b084a.tar.xz |
Merge branch 'picoxcell/devel' into next/devel
* picoxcell/devel: (1 commit)
ARM: picoxcell: implement watchdog restart
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3beagle.c')
-rw-r--r-- | arch/arm/mach-omap2/board-omap3beagle.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index 4a71cb7..c34f5658 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c @@ -40,7 +40,7 @@ #include <asm/mach/flash.h> #include <plat/board.h> -#include <plat/common.h> +#include "common.h" #include <video/omapdss.h> #include <video/omap-panel-dvi.h> #include <plat/gpmc.h> @@ -559,6 +559,7 @@ MACHINE_START(OMAP3_BEAGLE, "OMAP3 Beagle Board") .map_io = omap3_map_io, .init_early = omap3_init_early, .init_irq = omap3_init_irq, + .handle_irq = omap3_intc_handle_irq, .init_machine = omap3_beagle_init, .timer = &omap3_secure_timer, MACHINE_END |