Merge rsync://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	include/linux/kernel.h

1 files changed, 3 insertions, 5 deletions

diff --git a/include/asm-sh/floppy.h b/include/asm-sh/floppy.h
index 38d7a2942476..dc1ad464fa32 100644
--- a/include/asm-sh/floppy.h
+++ b/include/asm-sh/floppy.h
@@ -146,13 +146,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);
 }
 
 static unsigned long dma_mem_alloc(unsigned long size)