Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

[linux-2.6.git] / include / asm-i386 / mach-xen / asm / floppy.h

diff --git a/include/asm-i386/mach-xen/asm/floppy.h b/include/asm-i386/mach-xen/asm/floppy.h
index 2d5dd22..1396559 100644 (file)
--- a/include/asm-i386/mach-xen/asm/floppy.h
+++ b/include/asm-i386/mach-xen/asm/floppy.h
@@ -88,8 +88,8 @@ static void fd_disable_dma(void)
 
 static int fd_request_irq(void)
 {
-       return request_irq(FLOPPY_IRQ, floppy_hardint,SA_INTERRUPT,
-                                          "floppy", NULL);
+       return request_irq(FLOPPY_IRQ, floppy_hardint,
+                          IRQF_DISABLED, "floppy", NULL);
 }
 
 static int vdma_dma_setup(char *addr, unsigned long size, int mode, int io)