diff options
author | Olof Johansson <olof@lixom.net> | 2011-12-20 05:12:24 (GMT) |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2011-12-20 05:13:41 (GMT) |
commit | 844e8a16f25568eefd02a6bfb40bdd9bc04704b8 (patch) | |
tree | fdfe4de420c66517a2e4a2a25a454997c6210e95 /arch/arm/mach-cns3xxx/cns3420vb.c | |
parent | 5ecdd39f6cdd57aa42e072bf30aa7239fd109d7a (diff) | |
parent | a53bfa07369b7c3448a60d29f0fc2e81751ed0b7 (diff) | |
download | linux-844e8a16f25568eefd02a6bfb40bdd9bc04704b8.tar.xz |
Merge branch 'picoxcell/cleanup' into next/cleanup
* picoxcell/cleanup: (4 commits)
MAINTAINERS: add maintainer entry for Picochip picoxcell
ARM: picoxcell: move io mappings to common.c
ARM: picoxcell: don't reserve irq_descs
ARM: picoxcell: remove mach/memory.h
Conflicts:
arch/arm/mach-at91/setup.c
Diffstat (limited to 'arch/arm/mach-cns3xxx/cns3420vb.c')
-rw-r--r-- | arch/arm/mach-cns3xxx/cns3420vb.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-cns3xxx/cns3420vb.c b/arch/arm/mach-cns3xxx/cns3420vb.c index 55f7b4b..594852f 100644 --- a/arch/arm/mach-cns3xxx/cns3420vb.c +++ b/arch/arm/mach-cns3xxx/cns3420vb.c @@ -26,6 +26,7 @@ #include <linux/mtd/partitions.h> #include <asm/setup.h> #include <asm/mach-types.h> +#include <asm/hardware/gic.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> #include <asm/mach/time.h> @@ -201,5 +202,6 @@ MACHINE_START(CNS3420VB, "Cavium Networks CNS3420 Validation Board") .map_io = cns3420_map_io, .init_irq = cns3xxx_init_irq, .timer = &cns3xxx_timer, + .handle_irq = gic_handle_irq, .init_machine = cns3420_init, MACHINE_END |