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-ep93xx/snappercl15.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-ep93xx/snappercl15.c')
| -rw-r--r-- | arch/arm/mach-ep93xx/snappercl15.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-ep93xx/snappercl15.c b/arch/arm/mach-ep93xx/snappercl15.c index 50043eef1cf2..b4389d3820cc 100644 --- a/arch/arm/mach-ep93xx/snappercl15.c +++ b/arch/arm/mach-ep93xx/snappercl15.c @@ -31,7 +31,6 @@ #include <linux/platform_data/video-ep93xx.h> #include <mach/gpio-ep93xx.h> -#include <asm/hardware/vic.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> @@ -176,7 +175,6 @@ MACHINE_START(SNAPPER_CL15, "Bluewater Systems Snapper CL15") .atag_offset = 0x100, .map_io = ep93xx_map_io, .init_irq = ep93xx_init_irq, - .handle_irq = vic_handle_irq, .timer = &ep93xx_timer, .init_machine = snappercl15_init_machine, .init_late = ep93xx_init_late, |