Merge branch 'torvalds/master'

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-netx / nxdb500.c

diff --git a/arch/arm/mach-netx/nxdb500.c b/arch/arm/mach-netx/nxdb500.c
index 241e1b9c58cb5be730a3d432b7f288da9f9ac22e..9b558eb3070fd6d554a88c7f8d3bd580a8df3f27 100644 (file)
--- a/arch/arm/mach-netx/nxdb500.c
+++ b/arch/arm/mach-netx/nxdb500.c
@@ -28,7 +28,6 @@
 #include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
-#include <asm/hardware/vic.h>
 #include <mach/netx-regs.h>
 #include <linux/platform_data/eth-netx.h>
 
@@ -204,7 +203,6 @@ MACHINE_START(NXDB500, "Hilscher nxdb500")
        .atag_offset    = 0x100,
        .map_io         = netx_map_io,
        .init_irq       = netx_init_irq,
-       .handle_irq     = vic_handle_irq,
        .init_time      = netx_timer_init,
        .init_machine   = nxdb500_init,
        .restart        = netx_restart,