diff options
| author | Finn Thain <fthain@telegraphics.com.au> | 2007-05-01 22:32:55 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-05 02:59:07 +0200 |
| commit | 647b804c8237aa35e19caf8e11ea8d5565107b0e (patch) | |
| tree | f1ea341c082eaf92535757bdba14b40ba423a94c /arch/m68k/mac/psc.c | |
| parent | m68k: Mac DP8390 update (diff) | |
| download | linux-647b804c8237aa35e19caf8e11ea8d5565107b0e.tar.xz linux-647b804c8237aa35e19caf8e11ea8d5565107b0e.zip | |
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/psc.c')
| -rw-r--r-- | arch/m68k/mac/psc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/mac/psc.c b/arch/m68k/mac/psc.c index 15378a5878c9..401147985a96 100644 --- a/arch/m68k/mac/psc.c +++ b/arch/m68k/mac/psc.c @@ -149,8 +149,8 @@ irqreturn_t psc_irq(int irq, void *dev_id) for (i = 0, irq_bit = 1 ; i < 4 ; i++, irq_bit <<= 1) { if (events & irq_bit) { psc_write_byte(pIER, irq_bit); - m68k_handle_int(base_irq + i); psc_write_byte(pIFR, irq_bit); + m68k_handle_int(base_irq + i); psc_write_byte(pIER, irq_bit | 0x80); } } |