ARM: OMAP: Add support for Amstrad Delta keypad

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

diff --git a/include/asm-sh/floppy.h b/include/asm-sh/floppy.h
index 307d9ce9f9ed6bfbeec86c15fb32f3b6e15ab3b1..3b59b3af777bb16214072e4cb732230c295dbbbd 100644 (file)
--- a/include/asm-sh/floppy.h
+++ b/include/asm-sh/floppy.h
@@ -146,12 +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,
-                                  "floppy", NULL);
-
+               return request_irq(FLOPPY_IRQ, floppy_interrupt,
+                                  IRQF_DISABLED, "floppy", NULL);
 }
 
 static unsigned long dma_mem_alloc(unsigned long size)
@@ -182,7 +181,7 @@ static void _fd_chose_dma_mode(char *addr, unsigned long size)
 {
        if(can_use_virtual_dma == 2) {
                if((unsigned int) addr >= (unsigned int) high_memory ||
-                  virt_to_bus(addr) >= 0x10000000)
+                  virt_to_phys(addr) >= 0x10000000)
                        use_virtual_dma = 1;
                else
                        use_virtual_dma = 0;
@@ -220,7 +219,7 @@ static int hard_dma_setup(char *addr, unsigned long size, int mode, int io)
        doing_pdma = 0;
        clear_dma_ff(FLOPPY_DMA);
        set_dma_mode(FLOPPY_DMA,mode);
-       set_dma_addr(FLOPPY_DMA,virt_to_bus(addr));
+       set_dma_addr(FLOPPY_DMA,virt_to_phys(addr));
        set_dma_count(FLOPPY_DMA,size);
        enable_dma(FLOPPY_DMA);
        return 0;