summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-s5pc1xx/irq.c
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2009-12-09 07:14:38 +0100
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2009-12-09 07:14:38 +0100
commitbcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch)
tree2f6dffd2d3e4dd67355a224de7e7a960335a92fd /arch/arm/plat-s5pc1xx/irq.c
parentMAINTAINERS: Add PowerPC patterns (diff)
parentMerge branch 'x86-xen-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... (diff)
downloadlinux-bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71.tar.xz
linux-bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71.zip
Merge commit 'origin/master' into next
Conflicts: include/linux/kvm.h
Diffstat (limited to 'arch/arm/plat-s5pc1xx/irq.c')
-rw-r--r--arch/arm/plat-s5pc1xx/irq.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-s5pc1xx/irq.c b/arch/arm/plat-s5pc1xx/irq.c
index 80d6dd942cb8..e44fd04ef333 100644
--- a/arch/arm/plat-s5pc1xx/irq.c
+++ b/arch/arm/plat-s5pc1xx/irq.c
@@ -79,7 +79,7 @@ static void s3c_irq_timer_ack(unsigned int irq)
{
u32 reg = __raw_readl(S3C64XX_TINT_CSTAT);
- reg &= 0x1f;
+ reg &= 0x1f; /* mask out pending interrupts */
reg |= (1 << 5) << (irq - IRQ_TIMER0);
__raw_writel(reg, S3C64XX_TINT_CSTAT);
}