summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s5pc100/include
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2010-01-07 14:41:38 +0900
committerBen Dooks <ben-linux@fluff.org>2010-01-15 17:10:16 +0900
commit47101ec73901183520de724fb5f9062c014236bb (patch)
tree9b29c818702dfb1825b819764c381d484cb01bf8 /arch/arm/mach-s5pc100/include
parent35accd2f6639a9245488f2f389e3c6372c7641e4 (diff)
downloadtalos-obmc-linux-47101ec73901183520de724fb5f9062c014236bb.tar.gz
talos-obmc-linux-47101ec73901183520de724fb5f9062c014236bb.zip
ARM: S5PC1XX: Move to using standard timer IRQ handling code
Move to using the standard VIC/Timer IRQ handling code added previously to avoid duplicating code. Thanks to Marek Szyprowski for pointing out dual Kconfig change. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch/arm/mach-s5pc100/include')
-rw-r--r--arch/arm/mach-s5pc100/include/mach/tick.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s5pc100/include/mach/tick.h b/arch/arm/mach-s5pc100/include/mach/tick.h
index d3de0f3591ae..f338c9eec717 100644
--- a/arch/arm/mach-s5pc100/include/mach/tick.h
+++ b/arch/arm/mach-s5pc100/include/mach/tick.h
@@ -21,7 +21,7 @@
static inline u32 s3c24xx_ostimer_pending(void)
{
u32 pend = __raw_readl(S3C_VA_VIC0 + VIC_RAW_STATUS);
- return pend & 1 << (IRQ_TIMER4 - S5PC1XX_IRQ_VIC0(0));
+ return pend & 1 << (IRQ_TIMER4_VIC - S5PC1XX_IRQ_VIC0(0));
}
#define TICK_MAX (0xffffffff)
OpenPOWER on IntegriCloud