diff options
author | Olof Johansson <olof@lixom.net> | 2013-02-11 21:05:29 +0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-02-11 21:05:29 +0400 |
commit | 4f5c1c04f8623387ce4af942b2bf547d3bba40ae (patch) | |
tree | feb06499fb920d0fe0eaa6673e5cd630b3b7775f /arch/arm/mach-cns3xxx/cns3420vb.c | |
parent | 37a42fca282cb37c14d997ca9299bdc6617815bb (diff) | |
parent | 9e47b8bf9815523a5816f2f83e73b13812d74014 (diff) | |
download | linux-4f5c1c04f8623387ce4af942b2bf547d3bba40ae.tar.xz |
Merge branch 'irqchip/gic-vic-move' into next/virt
Diffstat (limited to 'arch/arm/mach-cns3xxx/cns3420vb.c')
-rw-r--r-- | arch/arm/mach-cns3xxx/cns3420vb.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-cns3xxx/cns3420vb.c b/arch/arm/mach-cns3xxx/cns3420vb.c index ae305397003c..26f36d7efecd 100644 --- a/arch/arm/mach-cns3xxx/cns3420vb.c +++ b/arch/arm/mach-cns3xxx/cns3420vb.c @@ -28,7 +28,6 @@ #include <linux/usb/ohci_pdriver.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> @@ -251,7 +250,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, .restart = cns3xxx_restart, MACHINE_END |