aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-sparc64/floppy.h
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2006-10-08 08:23:28 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-08 15:32:35 -0400
commit6d24c8dc2e656b02807aa0506405727d34c0376c (patch)
treeab5399601650d9dec7274bcc1ce22a7e490c1c61 /include/asm-sparc64/floppy.h
parent0d84438d98777b0f9425d39121c42f47a06878ca (diff)
[PATCH] sparc64 pt_regs fixes
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-sparc64/floppy.h')
-rw-r--r--include/asm-sparc64/floppy.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-sparc64/floppy.h b/include/asm-sparc64/floppy.h
index abf150038019..dbe033e494db 100644
--- a/include/asm-sparc64/floppy.h
+++ b/include/asm-sparc64/floppy.h
@@ -208,7 +208,7 @@ static void sun_fd_enable_dma(void)
208 pdma_areasize = pdma_size; 208 pdma_areasize = pdma_size;
209} 209}
210 210
211irqreturn_t sparc_floppy_irq(int irq, void *dev_cookie, struct pt_regs *regs) 211irqreturn_t sparc_floppy_irq(int irq, void *dev_cookie)
212{ 212{
213 if (likely(doing_pdma)) { 213 if (likely(doing_pdma)) {
214 void __iomem *stat = (void __iomem *) fdc_status; 214 void __iomem *stat = (void __iomem *) fdc_status;
@@ -255,7 +255,7 @@ irqreturn_t sparc_floppy_irq(int irq, void *dev_cookie, struct pt_regs *regs)
255 } 255 }
256 256
257main_interrupt: 257main_interrupt:
258 return floppy_interrupt(irq, dev_cookie, regs); 258 return floppy_interrupt(irq, dev_cookie);
259} 259}
260 260
261static int sun_fd_request_irq(void) 261static int sun_fd_request_irq(void)
@@ -311,7 +311,7 @@ struct sun_pci_dma_op {
311static struct sun_pci_dma_op sun_pci_dma_current = { -1U, 0, 0, NULL}; 311static struct sun_pci_dma_op sun_pci_dma_current = { -1U, 0, 0, NULL};
312static struct sun_pci_dma_op sun_pci_dma_pending = { -1U, 0, 0, NULL}; 312static struct sun_pci_dma_op sun_pci_dma_pending = { -1U, 0, 0, NULL};
313 313
314extern irqreturn_t floppy_interrupt(int irq, void *dev_id, struct pt_regs *regs); 314extern irqreturn_t floppy_interrupt(int irq, void *dev_id);
315 315
316static unsigned char sun_pci_fd_inb(unsigned long port) 316static unsigned char sun_pci_fd_inb(unsigned long port)
317{ 317{
@@ -446,7 +446,7 @@ static int sun_pci_fd_eject(int drive)
446 446
447void sun_pci_fd_dma_callback(struct ebus_dma_info *p, int event, void *cookie) 447void sun_pci_fd_dma_callback(struct ebus_dma_info *p, int event, void *cookie)
448{ 448{
449 floppy_interrupt(0, NULL, NULL); 449 floppy_interrupt(0, NULL);
450} 450}
451 451
452/* 452/*