Merge branch 'master' into upstream

[linux-2.6-omap-h63xx.git] / include / asm-arm / floppy.h

diff --git a/include/asm-arm/floppy.h b/include/asm-arm/floppy.h
index aa0c8d28d8d946ae6b3de0785c5a5aef0b6701e5..54b5ae44ed94498151572c7fa1e0a193e1ec20e9 100644 (file)
--- a/include/asm-arm/floppy.h
+++ b/include/asm-arm/floppy.h
@@ -25,7 +25,7 @@
 
 #define fd_inb(port)           inb((port))
 #define fd_request_irq()       request_irq(IRQ_FLOPPYDISK,floppy_interrupt,\
-                                           SA_INTERRUPT,"floppy",NULL)
+                                           IRQF_DISABLED,"floppy",NULL)
 #define fd_free_irq()          free_irq(IRQ_FLOPPYDISK,NULL)
 #define fd_disable_irq()       disable_irq(IRQ_FLOPPYDISK)
 #define fd_enable_irq()                enable_irq(IRQ_FLOPPYDISK)