]> err.no Git - linux-2.6/blobdiff - include/asm-m68k/floppy.h
Merge branch 'genirq' of master.kernel.org:/home/rmk/linux-2.6-arm
[linux-2.6] / include / asm-m68k / floppy.h
index 63a05ed95c17f1fd833385364c1fab00c1bf9bab..57f4fdda65ab264cda6aad4c28de27af34bf8d78 100644 (file)
@@ -88,8 +88,8 @@ static __inline__ void fd_outb(unsigned char value, int port)
 static int fd_request_irq(void)
 {
        if(MACH_IS_Q40)
-               return request_irq(FLOPPY_IRQ, floppy_hardint,SA_INTERRUPT,
-                                                  "floppy", floppy_hardint);
+               return request_irq(FLOPPY_IRQ, floppy_hardint,
+                                  IRQF_DISABLED, "floppy", floppy_hardint);
        else if(MACH_IS_SUN3X)
                return sun3xflop_request_irq();
        return -ENXIO;