diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-03-01 11:55:44 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-03-24 05:37:36 -0400 |
commit | 927b6c4da9e30f8f55add2e19487e71415c85bda (patch) | |
tree | baf834af27cc46e2fff291a9fcb48cee03bf80c9 /arch/arm/mach-rpc | |
parent | 18a66d5ae982c1e07d67a85e3723a1838caf79f6 (diff) |
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>
Diffstat (limited to 'arch/arm/mach-rpc')
-rw-r--r-- | arch/arm/mach-rpc/include/mach/irqs.h | 2 | ||||
-rw-r--r-- | arch/arm/mach-rpc/time.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-rpc/include/mach/irqs.h b/arch/arm/mach-rpc/include/mach/irqs.h index 3d2037496e38..6868e178274d 100644 --- a/arch/arm/mach-rpc/include/mach/irqs.h +++ b/arch/arm/mach-rpc/include/mach/irqs.h | |||
@@ -42,6 +42,4 @@ | |||
42 | */ | 42 | */ |
43 | #define FIQ_START 64 | 43 | #define FIQ_START 64 |
44 | 44 | ||
45 | #define IRQ_TIMER IRQ_TIMER0 | ||
46 | |||
47 | #define NR_IRQS 128 | 45 | #define NR_IRQS 128 |
diff --git a/arch/arm/mach-rpc/time.c b/arch/arm/mach-rpc/time.c index deeed561b168..581fca934bb3 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 = { | |||
85 | static void __init ioc_timer_init(void) | 85 | static void __init ioc_timer_init(void) |
86 | { | 86 | { |
87 | ioctime_init(); | 87 | ioctime_init(); |
88 | setup_irq(IRQ_TIMER, &ioc_timer_irq); | 88 | setup_irq(IRQ_TIMER0, &ioc_timer_irq); |
89 | } | 89 | } |
90 | 90 | ||
91 | struct sys_timer ioc_timer = { | 91 | struct sys_timer ioc_timer = { |