diff options
author | Finn Thain <fthain@telegraphics.com.au> | 2007-05-01 16:32:55 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-04 20:59:07 -0400 |
commit | 647b804c8237aa35e19caf8e11ea8d5565107b0e (patch) | |
tree | f1ea341c082eaf92535757bdba14b40ba423a94c /arch/m68k/mac/baboon.c | |
parent | 2964db0f590437b7efb7858bd2330134ac5292df (diff) |
m68k: reverse Mac IRQ damage
Reverse the last of a monumental brown-paper-bag commit that went into the 2.3
kernel.
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/m68k/mac/baboon.c')
-rw-r--r-- | arch/m68k/mac/baboon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/mac/baboon.c b/arch/m68k/mac/baboon.c index a1c7ec706741..303a3b56c51c 100644 --- a/arch/m68k/mac/baboon.c +++ b/arch/m68k/mac/baboon.c | |||
@@ -81,9 +81,9 @@ irqreturn_t baboon_irq(int irq, void *dev_id) | |||
81 | for (i = 0, irq_bit = 1 ; i < 3 ; i++, irq_bit <<= 1) { | 81 | for (i = 0, irq_bit = 1 ; i < 3 ; i++, irq_bit <<= 1) { |
82 | if (events & irq_bit/* & baboon_active*/) { | 82 | if (events & irq_bit/* & baboon_active*/) { |
83 | baboon_active &= ~irq_bit; | 83 | baboon_active &= ~irq_bit; |
84 | baboon->mb_ifr &= ~irq_bit; | ||
84 | m68k_handle_int(IRQ_BABOON_0 + i); | 85 | m68k_handle_int(IRQ_BABOON_0 + i); |
85 | baboon_active |= irq_bit; | 86 | baboon_active |= irq_bit; |
86 | baboon->mb_ifr &= ~irq_bit; | ||
87 | } | 87 | } |
88 | } | 88 | } |
89 | #if 0 | 89 | #if 0 |