diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-11 19:01:04 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-11 19:01:04 +0100 |
| commit | 1cf02bbd51a1ff74a31f88b1f654243a4affef8d (patch) | |
| tree | 6f7b43be22d6aeabe652d30e87b7c267c3cb9cbf /arch/arm/plat-s5p/irq.c | |
| parent | 805499a6d5d7b7fa8528170d1b2869ea88485f99 (diff) | |
| parent | bd7e388035d3c80aab360f18d123eb2e06eda8d1 (diff) | |
| download | kernel_samsung_smdk4412-1cf02bbd51a1ff74a31f88b1f654243a4affef8d.zip kernel_samsung_smdk4412-1cf02bbd51a1ff74a31f88b1f654243a4affef8d.tar.gz kernel_samsung_smdk4412-1cf02bbd51a1ff74a31f88b1f654243a4affef8d.tar.bz2 | |
Merge branch 'samsung-irq' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc-2.6 into devel-stable
Diffstat (limited to 'arch/arm/plat-s5p/irq.c')
| -rw-r--r-- | arch/arm/plat-s5p/irq.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/plat-s5p/irq.c b/arch/arm/plat-s5p/irq.c index 5560b12..a97c089 100644 --- a/arch/arm/plat-s5p/irq.c +++ b/arch/arm/plat-s5p/irq.c @@ -64,11 +64,7 @@ void __init s5p_init_irq(u32 *vic, u32 num_vic) vic_init(VA_VIC(irq), VIC_BASE(irq), vic[irq], 0); #endif - s3c_init_vic_timer_irq(IRQ_TIMER0_VIC, IRQ_TIMER0); - s3c_init_vic_timer_irq(IRQ_TIMER1_VIC, IRQ_TIMER1); - s3c_init_vic_timer_irq(IRQ_TIMER2_VIC, IRQ_TIMER2); - s3c_init_vic_timer_irq(IRQ_TIMER3_VIC, IRQ_TIMER3); - s3c_init_vic_timer_irq(IRQ_TIMER4_VIC, IRQ_TIMER4); + s3c_init_vic_timer_irq(5, IRQ_TIMER0); s3c_init_uart_irqs(uart_irqs, ARRAY_SIZE(uart_irqs)); } |