X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Fasm-parisc%2Ffloppy.h;h=da2f9c1571430e8a6a52e1c7b402eeea5205e31d;hb=7616ee95f27a04fd5a6434e9ef4a82cec4b2807c;hp=ca3aed768cdc1a8d3a528790bf073401f38acc19;hpb=7078253c085c037c070ca4e8bc9e9e7f18aa1e84;p=linux-2.6 diff --git a/include/asm-parisc/floppy.h b/include/asm-parisc/floppy.h index ca3aed768c..da2f9c1571 100644 --- a/include/asm-parisc/floppy.h +++ b/include/asm-parisc/floppy.h @@ -156,13 +156,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)