diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-10-06 21:09:40 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-10-06 21:09:40 +1000 |
| commit | 3211be5c6a61946c75318069611699c90b10e0f8 (patch) | |
| tree | eb88f097641788dfea4d4a8f6475293a1b010777 /include/asm-ppc | |
| parent | 49f19ce401edfff937c448dd74c22497da361889 (diff) | |
| download | linux-3211be5c6a61946c75318069611699c90b10e0f8.tar.gz linux-3211be5c6a61946c75318069611699c90b10e0f8.tar.bz2 linux-3211be5c6a61946c75318069611699c90b10e0f8.zip | |
[PPC] Fix some irq breakage with ARCH=ppc
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include/asm-ppc')
| -rw-r--r-- | include/asm-ppc/floppy.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-ppc/floppy.h b/include/asm-ppc/floppy.h index d3963ca79ad8..ae316e6d2ca9 100644 --- a/include/asm-ppc/floppy.h +++ b/include/asm-ppc/floppy.h @@ -38,14 +38,14 @@ static int virtual_dma_mode; static int doing_vdma; static struct fd_dma_ops *fd_ops; -static irqreturn_t floppy_hardint(int irq, void *dev_id, struct pt_regs * regs) +static irqreturn_t floppy_hardint(int irq, void *dev_id) { unsigned char st; int lcount; char *lptr; if (!doing_vdma) - return floppy_interrupt(irq, dev_id, regs); + return floppy_interrupt(irq, dev_id); st = 1; @@ -69,7 +69,7 @@ static irqreturn_t floppy_hardint(int irq, void *dev_id, struct pt_regs * regs) virtual_dma_residue += virtual_dma_count; virtual_dma_count=0; doing_vdma = 0; - floppy_interrupt(irq, dev_id, regs); + floppy_interrupt(irq, dev_id); return IRQ_HANDLED; } return IRQ_HANDLED; |