Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

[pandora-kernel.git] / include / asm-parisc / floppy.h

diff --git a/include/asm-parisc/floppy.h b/include/asm-parisc/floppy.h
index ca3aed7..458cdb2 100644 (file)
--- a/include/asm-parisc/floppy.h
+++ b/include/asm-parisc/floppy.h
@@ -159,10 +159,8 @@ static int fd_request_irq(void)
                return request_irq(FLOPPY_IRQ, floppy_hardint,SA_INTERRUPT,
                                                   "floppy", NULL);
        else
-               return request_irq(FLOPPY_IRQ, floppy_interrupt,
-                                                  SA_INTERRUPT|SA_SAMPLE_RANDOM,
-                                                  "floppy", NULL);     
-
+               return request_irq(FLOPPY_IRQ, floppy_interrupt, SA_INTERRUPT,
+                                  "floppy", NULL);
 }
 
 static unsigned long dma_mem_alloc(unsigned long size)