Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6

[sfrench/cifs-2.6.git] / include / asm-ppc / floppy.h

diff --git a/include/asm-ppc/floppy.h b/include/asm-ppc/floppy.h
index d3963ca79ad88a76c358a86c2a13c92969a977f6..7d9b3f430d929594343b7518f78131161aa47795 100644 (file)
--- 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;
@@ -166,8 +166,6 @@ static int FDC2 = -1;
 #define N_FDC 2                        /* Don't change this! */
 #define N_DRIVE 8
 
-#define FLOPPY_MOTOR_MASK 0xf0
-
 /*
  * The PowerPC has no problems with floppy DMA crossing 64k borders.
  */