From 3e11a6a7eaafcd229bad91620f81d88a6b3d9ca1 Mon Sep 17 00:00:00 2001 From: Ben Dooks Date: Wed, 3 Feb 2010 01:55:39 +0000 Subject: [PATCH] --- yaml --- r: 187643 b: refs/heads/master c: 28db4ed52d329ca06da9fbcc9dcf6c4e25cdcac2 h: refs/heads/master i: 187641: 9ae4cec615a65c31040465f3b9693692b4fcb236 187639: fa54f4b99ebbcf66085ce87eacd6a3cc655a2e1a 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 daf9709451fa..629861a792f0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 91492b4a04586e7cb191c72de9d1b22545a3ce16 +refs/heads/master: 28db4ed52d329ca06da9fbcc9dcf6c4e25cdcac2 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)