diff options
| author | merge <null@invalid> | 2008-12-14 10:41:11 +0000 |
|---|---|---|
| committer | Andy Green <agreen@pads.home.warmcat.com> | 2008-12-14 10:41:11 +0000 |
| commit | 93385ec1f27a215001ff1fc328045f26e265815a (patch) | |
| tree | 89ca20420be98102ce9a81fbed0599727186af53 /arch/arm/plat-s3c64xx | |
| parent | 6d4af9316dfe9c32bb34e3326b0f83d2e0dc4969 (diff) | |
MERGE-via-pending-tracking-hist-MERGE-via-stable-tracking-MERGE-via-mokopatches-tracking-MERGE-via-master-hist-1229249926-1229250322-1229250598
pending-tracking-hist top was MERGE-via-stable-tracking-MERGE-via-mokopatches-tracking-MERGE-via-master-hist-1229249926-1229250322-1229250598 / 1231dc713a5825b92b6809aa417686c579e6a9f9 ... parent commitmessage:
From: merge <null@invalid>
MERGE-via-stable-tracking-hist-MERGE-via-mokopatches-tracking-MERGE-via-master-hist-1229249926-1229250322
stable-tracking-hist top was MERGE-via-mokopatches-tracking-MERGE-via-master-hist-1229249926-1229250322 / 9c01cf722f0536f4827d76d36ee58c070b21c0da ... parent commitmessage:
From: merge <null@invalid>
MERGE-via-mokopatches-tracking-hist-MERGE-via-master-hist-1229249926
mokopatches-tracking-hist top was MERGE-via-master-hist-1229249926 / 8f700d425b380707d4f2b7052c1b1f7e77c8b7d3 ... parent commitmessage:
From: merge <null@invalid>
MERGE-mokopatches-tracking-patchset-edits
Diffstat (limited to 'arch/arm/plat-s3c64xx')
| -rw-r--r-- | arch/arm/plat-s3c64xx/irq-eint.c | 2 | ||||
| -rw-r--r-- | arch/arm/plat-s3c64xx/irq.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/plat-s3c64xx/irq-eint.c b/arch/arm/plat-s3c64xx/irq-eint.c index f9439fa0be2..4f9fbe705fb 100644 --- a/arch/arm/plat-s3c64xx/irq-eint.c +++ b/arch/arm/plat-s3c64xx/irq-eint.c @@ -46,7 +46,7 @@ static void s3c_irq_eint_unmask(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); } diff --git a/arch/arm/plat-s3c64xx/irq.c b/arch/arm/plat-s3c64xx/irq.c index 12e9d689b15..79166767fd3 100644 --- a/arch/arm/plat-s3c64xx/irq.c +++ b/arch/arm/plat-s3c64xx/irq.c @@ -251,8 +251,6 @@ void __init s3c64xx_init_irq(u32 vic0_valid, u32 vic1_valid) for (uart = 0; uart < ARRAY_SIZE(uart_irqs); uart++) s3c64xx_uart_irq(&uart_irqs[uart]); - } - |