diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-03-01 16:55:44 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-03-24 09:37:36 +0000 |
| commit | 927b6c4da9e30f8f55add2e19487e71415c85bda (patch) | |
| tree | baf834af27cc46e2fff291a9fcb48cee03bf80c9 | |
| parent | 18a66d5ae982c1e07d67a85e3723a1838caf79f6 (diff) | |
| download | blackbird-op-linux-927b6c4da9e30f8f55add2e19487e71415c85bda.tar.gz blackbird-op-linux-927b6c4da9e30f8f55add2e19487e71415c85bda.zip | |
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>
| -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 @@ */ #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 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 = { 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 = { |
