diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-12-27 22:45:51 +0000 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-12-27 22:45:51 +0000 |
commit | e5570bbc9c06634cfac94e06ac1432b53d8595e5 (patch) | |
tree | bfaf6b5ddedaa03d31400b25b25cfaa3bd0c9107 /arch/arm/mach-spear6xx/spear600_evb.c | |
parent | 5611cc4572e889b62a7b4c72a413536bf6a9c416 (diff) | |
parent | 6cc04a4420391c3f034afe8ea6e28d75912a70a3 (diff) | |
download | lwn-e5570bbc9c06634cfac94e06ac1432b53d8595e5.tar.gz lwn-e5570bbc9c06634cfac94e06ac1432b53d8595e5.zip |
Merge branch 'for-3.3/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra into tegra/soc
Diffstat (limited to 'arch/arm/mach-spear6xx/spear600_evb.c')
-rw-r--r-- | arch/arm/mach-spear6xx/spear600_evb.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-spear6xx/spear600_evb.c b/arch/arm/mach-spear6xx/spear600_evb.c index 8238fe38e713..ff139ed0a61e 100644 --- a/arch/arm/mach-spear6xx/spear600_evb.c +++ b/arch/arm/mach-spear6xx/spear600_evb.c @@ -11,6 +11,7 @@ * warranty of any kind, whether express or implied. */ +#include <asm/hardware/vic.h> #include <asm/mach/arch.h> #include <asm/mach-types.h> #include <mach/generic.h> @@ -46,6 +47,7 @@ MACHINE_START(SPEAR600, "ST-SPEAR600-EVB") .atag_offset = 0x100, .map_io = spear6xx_map_io, .init_irq = spear6xx_init_irq, + .handle_irq = vic_handle_irq, .timer = &spear6xx_timer, .init_machine = spear600_evb_init, MACHINE_END |