diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-03 13:49:45 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-03 13:49:45 -0400 |
| commit | 026477c1141b67e98e3bd8bdedb7d4b88a3ecd09 (patch) | |
| tree | 2624a44924c625c367f3cebf937853b9da2de282 /include/asm-parisc/floppy.h | |
| parent | 9f2fa466383ce100b90fe52cb4489d7a26bf72a9 (diff) | |
| parent | 29454dde27d8e340bb1987bad9aa504af7081eba (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'include/asm-parisc/floppy.h')
| -rw-r--r-- | include/asm-parisc/floppy.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-parisc/floppy.h b/include/asm-parisc/floppy.h index 458cdb2a7530..da2f9c157143 100644 --- a/include/asm-parisc/floppy.h +++ b/include/asm-parisc/floppy.h | |||
| @@ -156,11 +156,11 @@ static int vdma_get_dma_residue(unsigned int dummy) | |||
| 156 | static int fd_request_irq(void) | 156 | static int fd_request_irq(void) |
| 157 | { | 157 | { |
| 158 | if(can_use_virtual_dma) | 158 | if(can_use_virtual_dma) |
| 159 | return request_irq(FLOPPY_IRQ, floppy_hardint,SA_INTERRUPT, | 159 | return request_irq(FLOPPY_IRQ, floppy_hardint, |
| 160 | "floppy", NULL); | 160 | IRQF_DISABLED, "floppy", NULL); |
| 161 | else | 161 | else |
| 162 | return request_irq(FLOPPY_IRQ, floppy_interrupt, SA_INTERRUPT, | 162 | return request_irq(FLOPPY_IRQ, floppy_interrupt, |
| 163 | "floppy", NULL); | 163 | IRQF_DISABLED, "floppy", NULL); |
| 164 | } | 164 | } |
| 165 | 165 | ||
| 166 | static unsigned long dma_mem_alloc(unsigned long size) | 166 | static unsigned long dma_mem_alloc(unsigned long size) |