[PATCH] x86: Some preparationary cleanup for stack trace

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

diff --git a/include/asm-i386/floppy.h b/include/asm-i386/floppy.h
index 03403045c182945230f9729d3bcbebbc380d3580..359ead60b7189f33e5b3989e78e4bff1fd732341 100644 (file)
--- a/include/asm-i386/floppy.h
+++ b/include/asm-i386/floppy.h
@@ -144,12 +144,11 @@ static int vdma_get_dma_residue(unsigned int dummy)
 static int fd_request_irq(void)
 {
        if(can_use_virtual_dma)
-               return request_irq(FLOPPY_IRQ, floppy_hardint,SA_INTERRUPT,
-                                                  "floppy", NULL);
+               return request_irq(FLOPPY_IRQ, floppy_hardint,
+                                  IRQF_DISABLED, "floppy", NULL);
        else
                return request_irq(FLOPPY_IRQ, floppy_interrupt,
-                                                  SA_INTERRUPT|SA_SAMPLE_RANDOM,
-                                                  "floppy", NULL);     
+                                  IRQF_DISABLED, "floppy", NULL);
 
 }