diff options
author | Paul Mackerras <paulus@samba.org> | 2006-10-06 07:09:40 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-10-06 07:09:40 -0400 |
commit | 3211be5c6a61946c75318069611699c90b10e0f8 (patch) | |
tree | eb88f097641788dfea4d4a8f6475293a1b010777 /include/asm-ppc | |
parent | 49f19ce401edfff937c448dd74c22497da361889 (diff) |
[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; | |||
38 | static int doing_vdma; | 38 | static int doing_vdma; |
39 | static struct fd_dma_ops *fd_ops; | 39 | static struct fd_dma_ops *fd_ops; |
40 | 40 | ||
41 | static irqreturn_t floppy_hardint(int irq, void *dev_id, struct pt_regs * regs) | 41 | static irqreturn_t floppy_hardint(int irq, void *dev_id) |
42 | { | 42 | { |
43 | unsigned char st; | 43 | unsigned char st; |
44 | int lcount; | 44 | int lcount; |
45 | char *lptr; | 45 | char *lptr; |
46 | 46 | ||
47 | if (!doing_vdma) | 47 | if (!doing_vdma) |
48 | return floppy_interrupt(irq, dev_id, regs); | 48 | return floppy_interrupt(irq, dev_id); |
49 | 49 | ||
50 | 50 | ||
51 | st = 1; | 51 | st = 1; |
@@ -69,7 +69,7 @@ static irqreturn_t floppy_hardint(int irq, void *dev_id, struct pt_regs * regs) | |||
69 | virtual_dma_residue += virtual_dma_count; | 69 | virtual_dma_residue += virtual_dma_count; |
70 | virtual_dma_count=0; | 70 | virtual_dma_count=0; |
71 | doing_vdma = 0; | 71 | doing_vdma = 0; |
72 | floppy_interrupt(irq, dev_id, regs); | 72 | floppy_interrupt(irq, dev_id); |
73 | return IRQ_HANDLED; | 73 | return IRQ_HANDLED; |
74 | } | 74 | } |
75 | return IRQ_HANDLED; | 75 | return IRQ_HANDLED; |