projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 18a66d5)
ARM: riscpc: remove IRQ_TIMER
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 1 Mar 2012 16:55:44 +0000 (16:55 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 24 Mar 2012 09:37:36 +0000 (09:37 +0000)
Use IRQ_TIMER0 instead, which is the same thing.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/mach-rpc/include/mach/irqs.h patch | blob | blame | history
arch/arm/mach-rpc/time.c patch | blob | blame | history

diff --git a/arch/arm/mach-rpc/include/mach/irqs.h b/arch/arm/mach-rpc/include/mach/irqs.h
index 3d2037496e38cd4955f29ecb9ca1f09e715e7608..6868e178274d93893983874e076730aa753e6f06 100644 (file)
--- 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 deeed561b168267564ffa41309e230678156a3c4..581fca934bb3e73adb055bcb2d7caff9aef978f9 100644 (file)
--- 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 = {