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-ppc/floppy.h b/include/asm-ppc/floppy.h
index 8ccd4a276fe9..d3963ca79ad8 100644
--- a/include/asm-ppc/floppy.h
+++ b/include/asm-ppc/floppy.h
@@ -96,13 +96,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 int vdma_dma_setup(char *addr, unsigned long size, int mode, int io)