X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fasm-sh%2Ffloppy.h;h=dc1ad464fa32f2b2fe30f7ba48f0223744e0d34a;hb=refs%2Fheads%2Fvserver;hp=38d7a2942476dff07e61e396cf2175778df08c6a;hpb=76828883507a47dae78837ab5dec5a5b4513c667;p=linux-2.6.git diff --git a/include/asm-sh/floppy.h b/include/asm-sh/floppy.h index 38d7a2942..dc1ad464f 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) 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)