diff options
| author | Marc Zyngier <marc.zyngier@arm.com> | 2013-01-24 07:03:36 -0500 |
|---|---|---|
| committer | Marc Zyngier <marc.zyngier@arm.com> | 2013-01-24 07:03:36 -0500 |
| commit | 369e67595ad8f278edf32a65f10ba473baeff03e (patch) | |
| tree | a3bba5b97c6bb522343cf16a216047e9ca99d90c /arch/arm/mach-s5p64x0/mach-smdk6450.c | |
| parent | a749474de5f0f5902f59acb5c7f4dc6b816ac788 (diff) | |
| parent | 9e47b8bf9815523a5816f2f83e73b13812d74014 (diff) | |
Merge remote-tracking branch 'arm-soc/irqchip/gic-vic-move' into kvm-arm/vgic
Diffstat (limited to 'arch/arm/mach-s5p64x0/mach-smdk6450.c')
| -rw-r--r-- | arch/arm/mach-s5p64x0/mach-smdk6450.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-s5p64x0/mach-smdk6450.c b/arch/arm/mach-s5p64x0/mach-smdk6450.c index 62526ccf6b70..999273107fa9 100644 --- a/arch/arm/mach-s5p64x0/mach-smdk6450.c +++ b/arch/arm/mach-s5p64x0/mach-smdk6450.c | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | #include <video/platform_lcd.h> | 29 | #include <video/platform_lcd.h> |
| 30 | #include <video/samsung_fimd.h> | 30 | #include <video/samsung_fimd.h> |
| 31 | 31 | ||
| 32 | #include <asm/hardware/vic.h> | ||
| 33 | #include <asm/mach/arch.h> | 32 | #include <asm/mach/arch.h> |
| 34 | #include <asm/mach/map.h> | 33 | #include <asm/mach/map.h> |
| 35 | #include <asm/irq.h> | 34 | #include <asm/irq.h> |
| @@ -291,7 +290,6 @@ MACHINE_START(SMDK6450, "SMDK6450") | |||
| 291 | .atag_offset = 0x100, | 290 | .atag_offset = 0x100, |
| 292 | 291 | ||
| 293 | .init_irq = s5p6450_init_irq, | 292 | .init_irq = s5p6450_init_irq, |
| 294 | .handle_irq = vic_handle_irq, | ||
| 295 | .map_io = smdk6450_map_io, | 293 | .map_io = smdk6450_map_io, |
| 296 | .init_machine = smdk6450_machine_init, | 294 | .init_machine = smdk6450_machine_init, |
| 297 | .timer = &s5p_timer, | 295 | .timer = &s5p_timer, |