summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-04-11 15:44:45 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-04-11 15:44:45 -0700
commit80584ff3b99c36ead7e130e453b3a48b18072d18 (patch)
treee6e16d05645bc4a69cddc8ca1097b8f2ec73a387
parent73aba63c5d62f4f504c6469c7c56311a0c818b20 (diff)
parent22132178b26c907d19f661a4ae7fd265962d417e (diff)
downloadlinux-sh-80584ff3b99c36ead7e130e453b3a48b18072d18.tar.gz
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: [POWERPC] mpc52xx_pic: fix main interrupt masking
-rw-r--r--arch/powerpc/platforms/52xx/mpc52xx_pic.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_pic.c b/arch/powerpc/platforms/52xx/mpc52xx_pic.c
index c75192567e55..fbfff95b4437 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_pic.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_pic.c
@@ -128,7 +128,7 @@ static void mpc52xx_main_mask(unsigned int virq)
pr_debug("%s: irq=%x. l2=%d\n", __func__, irq, l2irq);
- io_be_setbit(&intr->main_mask, 15 - l2irq);
+ io_be_setbit(&intr->main_mask, 16 - l2irq);
}
static void mpc52xx_main_unmask(unsigned int virq)
@@ -141,7 +141,7 @@ static void mpc52xx_main_unmask(unsigned int virq)
pr_debug("%s: irq=%x. l2=%d\n", __func__, irq, l2irq);
- io_be_clrbit(&intr->main_mask, 15 - l2irq);
+ io_be_clrbit(&intr->main_mask, 16 - l2irq);
}
static struct irq_chip mpc52xx_main_irqchip = {