diff options
author | Olof Johansson <olof@lixom.net> | 2013-02-11 17:05:29 (GMT) |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-02-11 17:05:29 (GMT) |
commit | 4f5c1c04f8623387ce4af942b2bf547d3bba40ae (patch) | |
tree | feb06499fb920d0fe0eaa6673e5cd630b3b7775f /arch/arm/mach-s3c64xx/mach-smdk6400.c | |
parent | 37a42fca282cb37c14d997ca9299bdc6617815bb (diff) | |
parent | 9e47b8bf9815523a5816f2f83e73b13812d74014 (diff) | |
download | linux-fsl-qoriq-4f5c1c04f8623387ce4af942b2bf547d3bba40ae.tar.xz |
Merge branch 'irqchip/gic-vic-move' into next/virt
Diffstat (limited to 'arch/arm/mach-s3c64xx/mach-smdk6400.c')
-rw-r--r-- | arch/arm/mach-s3c64xx/mach-smdk6400.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c64xx/mach-smdk6400.c b/arch/arm/mach-s3c64xx/mach-smdk6400.c index a928fae..7df76e4 100644 --- a/arch/arm/mach-s3c64xx/mach-smdk6400.c +++ b/arch/arm/mach-s3c64xx/mach-smdk6400.c @@ -22,7 +22,6 @@ #include <asm/mach-types.h> -#include <asm/hardware/vic.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> #include <asm/mach/irq.h> @@ -90,7 +89,6 @@ MACHINE_START(SMDK6400, "SMDK6400") .atag_offset = 0x100, .init_irq = s3c6400_init_irq, - .handle_irq = vic_handle_irq, .map_io = smdk6400_map_io, .init_machine = smdk6400_machine_init, .init_late = s3c64xx_init_late, |