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-tegra/board-trimslice.c | |
parent | f68453e076dcf140c4a7bdd385f239b1e41be983 (diff) | |
parent | 1b46f8782c2607afa1298b0c7f7fe307fc0f7a5b (diff) | |
download | op-kernel-dev-4b3ee30b5201ddeefdc56ad32b6bbc1fab8b084a.zip op-kernel-dev-4b3ee30b5201ddeefdc56ad32b6bbc1fab8b084a.tar.gz |
Merge branch 'picoxcell/devel' into next/devel
* picoxcell/devel: (1 commit)
ARM: picoxcell: implement watchdog restart
Diffstat (limited to 'arch/arm/mach-tegra/board-trimslice.c')
-rw-r--r-- | arch/arm/mach-tegra/board-trimslice.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/board-trimslice.c b/arch/arm/mach-tegra/board-trimslice.c index 1a6617b..60a36a2 100644 --- a/arch/arm/mach-tegra/board-trimslice.c +++ b/arch/arm/mach-tegra/board-trimslice.c @@ -26,6 +26,7 @@ #include <linux/i2c.h> #include <linux/gpio.h> +#include <asm/hardware/gic.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/setup.h> @@ -176,6 +177,7 @@ MACHINE_START(TRIMSLICE, "trimslice") .map_io = tegra_map_common_io, .init_early = tegra_init_early, .init_irq = tegra_init_irq, + .handle_irq = gic_handle_irq, .timer = &tegra_timer, .init_machine = tegra_trimslice_init, MACHINE_END |