From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Thu, 1 Mar 2012 16:55:44 +0000 (+0000)
Subject: ARM: riscpc: remove IRQ_TIMER
X-Git-Tag: v3.4-rc1~83^2~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=927b6c4da9e30f8f55add2e19487e71415c85bda;p=platform%2Fkernel%2Flinux-3.10.git

ARM: riscpc: remove IRQ_TIMER

Use IRQ_TIMER0 instead, which is the same thing.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

diff --git a/arch/arm/mach-rpc/include/mach/irqs.h b/arch/arm/mach-rpc/include/mach/irqs.h
index 3d20374..6868e17 100644
--- a/arch/arm/mach-rpc/include/mach/irqs.h
+++ b/arch/arm/mach-rpc/include/mach/irqs.h
@@ -42,6 +42,4 @@
  */
 #define FIQ_START		64
 
-#define IRQ_TIMER		IRQ_TIMER0
-
 #define NR_IRQS			128
diff --git a/arch/arm/mach-rpc/time.c b/arch/arm/mach-rpc/time.c
index deeed56..581fca9 100644
--- a/arch/arm/mach-rpc/time.c
+++ b/arch/arm/mach-rpc/time.c
@@ -85,7 +85,7 @@ static struct irqaction ioc_timer_irq = {
 static void __init ioc_timer_init(void)
 {
 	ioctime_init();
-	setup_irq(IRQ_TIMER, &ioc_timer_irq);
+	setup_irq(IRQ_TIMER0, &ioc_timer_irq);
 }
 
 struct sys_timer ioc_timer = {