From 061920ff9e60e0a51485ef36e4160de9ae233005 Mon Sep 17 00:00:00 2001 From: Atul Dahiya Date: Fri, 29 Jan 2010 09:08:28 +0900 Subject: [PATCH] --- yaml --- r: 187635 b: refs/heads/master c: 87aef30eb3c5dac0491c83fe3b90bc61f1df24ec h: refs/heads/master i: 187633: 22e46bb310bbe888f23beb0c8ac0cfe3fb910aaa 187631: 32d028c2f581eaee1b0b436bae1b204cb0cd4f8e v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-s5p/include/plat/irqs.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c2937766fbf8..f90b3fe49e94 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 81317960466ebd37fd958aa07993e3fea461dbe4 +refs/heads/master: 87aef30eb3c5dac0491c83fe3b90bc61f1df24ec diff --git a/trunk/arch/arm/plat-s5p/include/plat/irqs.h b/trunk/arch/arm/plat-s5p/include/plat/irqs.h index 878acfe3690f..101038d49944 100644 --- a/trunk/arch/arm/plat-s5p/include/plat/irqs.h +++ b/trunk/arch/arm/plat-s5p/include/plat/irqs.h @@ -74,7 +74,7 @@ #define S5P_IRQ_VIC0(x) (S5P_VIC0_BASE + (x)) #define S5P_IRQ_VIC1(x) (S5P_VIC1_BASE + (x)) -#define S5P_TIMER_IRQ(x) S5P_IRQ(64 + (x)) +#define S5P_TIMER_IRQ(x) S5P_IRQ(11 + (x)) #define IRQ_TIMER0 S5P_TIMER_IRQ(0) #define IRQ_TIMER1 S5P_TIMER_IRQ(1)