diff options
Diffstat (limited to 'include/asm-sh/floppy.h')
| -rw-r--r-- | include/asm-sh/floppy.h | 8 |
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) | |||
| 146 | static int fd_request_irq(void) | 146 | static int fd_request_irq(void) |
| 147 | { | 147 | { |
| 148 | if(can_use_virtual_dma) | 148 | if(can_use_virtual_dma) |
| 149 | return request_irq(FLOPPY_IRQ, floppy_hardint,SA_INTERRUPT, | 149 | return request_irq(FLOPPY_IRQ, floppy_hardint, |
| 150 | "floppy", NULL); | 150 | IRQF_DISABLED, "floppy", NULL); |
| 151 | else | 151 | else |
| 152 | return request_irq(FLOPPY_IRQ, floppy_interrupt, | 152 | return request_irq(FLOPPY_IRQ, floppy_interrupt, |
| 153 | SA_INTERRUPT|SA_SAMPLE_RANDOM, | 153 | IRQF_DISABLED, "floppy", NULL); |
| 154 | "floppy", NULL); | ||
| 155 | |||
| 156 | } | 154 | } |
| 157 | 155 | ||
| 158 | static unsigned long dma_mem_alloc(unsigned long size) | 156 | static unsigned long dma_mem_alloc(unsigned long size) |
