sh: Calculate shm alignment at runtime.

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

diff --git a/include/asm-sh/floppy.h b/include/asm-sh/floppy.h
index f030ca0..dc1ad46 100644 (file)
--- 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)
@@ -227,7 +225,7 @@ static int hard_dma_setup(char *addr, unsigned long size, int mode, int io)
        return 0;
 }
 
-struct fd_routine_l {
+static struct fd_routine_l {
        int (*_request_dma)(unsigned int dmanr, const char * device_id);
        void (*_free_dma)(unsigned int dmanr);
        int (*_get_dma_residue)(unsigned int dummy);