From 96898b259631f6002d55fe93dc64557b0be7b032 Mon Sep 17 00:00:00 2001 From: Russell King Date: Thu, 1 Mar 2012 16:55:44 +0000 Subject: [PATCH] --- yaml --- r: 296259 b: refs/heads/master c: 927b6c4da9e30f8f55add2e19487e71415c85bda h: refs/heads/master i: 296257: dbe4c1746b2eb92c6e8010a7e2e4866c32051931 296255: 18e66e814119b2bf509b97dc383885d6dfb14f86 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-rpc/include/mach/irqs.h | 2 -- trunk/arch/arm/mach-rpc/time.c | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 3c1a280b4a58..303dbf366197 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 18a66d5ae982c1e07d67a85e3723a1838caf79f6 +refs/heads/master: 927b6c4da9e30f8f55add2e19487e71415c85bda diff --git a/trunk/arch/arm/mach-rpc/include/mach/irqs.h b/trunk/arch/arm/mach-rpc/include/mach/irqs.h index 3d2037496e38..6868e178274d 100644 --- a/trunk/arch/arm/mach-rpc/include/mach/irqs.h +++ b/trunk/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/trunk/arch/arm/mach-rpc/time.c b/trunk/arch/arm/mach-rpc/time.c index deeed561b168..581fca934bb3 100644 --- a/trunk/arch/arm/mach-rpc/time.c +++ b/trunk/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 = {