diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-04-12 13:50:03 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-04-12 13:50:03 -0400 |
| commit | e049d1ca3094f3d1d94617f456a9961202f96e3a (patch) | |
| tree | a30397ad22f2fbea268bd28fa69c60aad9dfa62a /arch/powerpc/platforms/52xx | |
| parent | edfac96a92b88d3b0b53e3f8231b74beee9ecd1d (diff) | |
| parent | 80584ff3b99c36ead7e130e453b3a48b18072d18 (diff) | |
Merge branch 'linux-2.6' into for-2.6.22
Diffstat (limited to 'arch/powerpc/platforms/52xx')
| -rw-r--r-- | arch/powerpc/platforms/52xx/mpc52xx_pic.c | 4 |
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) | |||
| 128 | 128 | ||
| 129 | pr_debug("%s: irq=%x. l2=%d\n", __func__, irq, l2irq); | 129 | pr_debug("%s: irq=%x. l2=%d\n", __func__, irq, l2irq); |
| 130 | 130 | ||
| 131 | io_be_setbit(&intr->main_mask, 15 - l2irq); | 131 | io_be_setbit(&intr->main_mask, 16 - l2irq); |
| 132 | } | 132 | } |
| 133 | 133 | ||
| 134 | static void mpc52xx_main_unmask(unsigned int virq) | 134 | static void mpc52xx_main_unmask(unsigned int virq) |
| @@ -141,7 +141,7 @@ static void mpc52xx_main_unmask(unsigned int virq) | |||
| 141 | 141 | ||
| 142 | pr_debug("%s: irq=%x. l2=%d\n", __func__, irq, l2irq); | 142 | pr_debug("%s: irq=%x. l2=%d\n", __func__, irq, l2irq); |
| 143 | 143 | ||
| 144 | io_be_clrbit(&intr->main_mask, 15 - l2irq); | 144 | io_be_clrbit(&intr->main_mask, 16 - l2irq); |
| 145 | } | 145 | } |
| 146 | 146 | ||
| 147 | static struct irq_chip mpc52xx_main_irqchip = { | 147 | static struct irq_chip mpc52xx_main_irqchip = { |