diff options
| author | Olof Johansson <olof@lixom.net> | 2013-02-11 09:05:29 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-02-11 09:05:29 -0800 |
| commit | 4f5c1c04f8623387ce4af942b2bf547d3bba40ae (patch) | |
| tree | feb06499fb920d0fe0eaa6673e5cd630b3b7775f /arch/arm/mach-s5pv210/mach-smdkv210.c | |
| parent | 37a42fca282cb37c14d997ca9299bdc6617815bb (diff) | |
| parent | 9e47b8bf9815523a5816f2f83e73b13812d74014 (diff) | |
| download | linux-4f5c1c04f8623387ce4af942b2bf547d3bba40ae.tar.gz linux-4f5c1c04f8623387ce4af942b2bf547d3bba40ae.tar.bz2 linux-4f5c1c04f8623387ce4af942b2bf547d3bba40ae.zip | |
Merge branch 'irqchip/gic-vic-move' into next/virt
Diffstat (limited to 'arch/arm/mach-s5pv210/mach-smdkv210.c')
| -rw-r--r-- | arch/arm/mach-s5pv210/mach-smdkv210.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-s5pv210/mach-smdkv210.c b/arch/arm/mach-s5pv210/mach-smdkv210.c index 6bc8404bf678..721967bc3927 100644 --- a/arch/arm/mach-s5pv210/mach-smdkv210.c +++ b/arch/arm/mach-s5pv210/mach-smdkv210.c @@ -21,7 +21,6 @@ #include <linux/pwm_backlight.h> #include <linux/platform_data/s3c-hsotg.h> -#include <asm/hardware/vic.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> #include <asm/setup.h> @@ -328,7 +327,6 @@ MACHINE_START(SMDKV210, "SMDKV210") /* Maintainer: Kukjin Kim <kgene.kim@samsung.com> */ .atag_offset = 0x100, .init_irq = s5pv210_init_irq, - .handle_irq = vic_handle_irq, .map_io = smdkv210_map_io, .init_machine = smdkv210_machine_init, .timer = &s5p_timer, |