aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/plat-s3c64xx
diff options
context:
space:
mode:
authorAndy Green <andy@openmoko.com>2008-12-03 15:12:08 +0000
committerAndy Green <agreen@pads.home.warmcat.com>2008-12-03 15:12:08 +0000
commit0b519f14e15365213924505e2e3019c1ff159aa9 (patch)
tree9b70815652f11ee601cf0127341b4e84c1429630 /arch/arm/plat-s3c64xx
parent3d07f3f0db6f78c47cc2feb5f40eedc76a907845 (diff)
fix-actual-level-problem.patch
Matt's patch managed to get applied twice because the context of the diff was met perfectly in another place... This reverts that and also reverts the GTA03 specific level stuffs. Signed-off-by: Andy Green <andy@openmoko.com>
Diffstat (limited to 'arch/arm/plat-s3c64xx')
-rw-r--r--arch/arm/plat-s3c64xx/irq-eint.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-s3c64xx/irq-eint.c b/arch/arm/plat-s3c64xx/irq-eint.c
index b05999eaa03..7f853473df7 100644
--- a/arch/arm/plat-s3c64xx/irq-eint.c
+++ b/arch/arm/plat-s3c64xx/irq-eint.c
@@ -36,7 +36,7 @@ static inline void s3c_irq_eint_mask(unsigned int irq)
u32 mask;
mask = __raw_readl(S3C64XX_EINT0MASK);
- mask &= ~eint_irq_to_bit(irq);
+ mask |= eint_irq_to_bit(irq);
__raw_writel(mask, S3C64XX_EINT0MASK);
}