Merge tag 'dt-3.13-4' of git://git.infradead.org/linux-mvebu into next/dt

[firefly-linux-kernel-4.4.55.git] / arch / arm / plat-samsung / s5p-irq.c

diff --git a/arch/arm/plat-samsung/s5p-irq.c b/arch/arm/plat-samsung/s5p-irq.c
index ff1a76011b1ed2a2e2e547399fd230decc63d956..ddfaca9c79d82b0149651b70c168836fdd46d581 100644 (file)
--- a/arch/arm/plat-samsung/s5p-irq.c
+++ b/arch/arm/plat-samsung/s5p-irq.c
@@ -17,9 +17,7 @@
 
 #include <mach/irqs.h>
 #include <mach/map.h>
-#include <plat/regs-timer.h>
 #include <plat/cpu.h>
-#include <plat/irq-vic-timer.h>
 
 void __init s5p_init_irq(u32 *vic, u32 num_vic)
 {
@@ -30,6 +28,4 @@ void __init s5p_init_irq(u32 *vic, u32 num_vic)
        for (irq = 0; irq < num_vic; irq++)
                vic_init(VA_VIC(irq), VIC_BASE(irq), vic[irq], 0);
 #endif
-
-       s3c_init_vic_timer_irq(5, IRQ_TIMER0);
 }