diff options
| author | Sam Ravnborg <sam@mars.ravnborg.org> | 2006-07-03 23:24:23 +0200 |
|---|---|---|
| committer | Sam Ravnborg <sam@mars.ravnborg.org> | 2006-07-03 23:24:23 +0200 |
| commit | 05668381140309088443bf5dc53add4104610fbb (patch) | |
| tree | ed53039717390e1a71ff16209281b1f1c8d3e6be /include/asm-arm/floppy.h | |
| parent | 34c162f79e374556dd1384437f0dab558b5dc657 (diff) | |
| parent | 29454dde27d8e340bb1987bad9aa504af7081eba (diff) | |
| download | op-kernel-dev-05668381140309088443bf5dc53add4104610fbb.zip op-kernel-dev-05668381140309088443bf5dc53add4104610fbb.tar.gz | |
Merge branch 'master' of /home/sam/kernel/linux-2.6/
Diffstat (limited to 'include/asm-arm/floppy.h')
| -rw-r--r-- | include/asm-arm/floppy.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-arm/floppy.h b/include/asm-arm/floppy.h index aa0c8d2..54b5ae4 100644 --- a/include/asm-arm/floppy.h +++ b/include/asm-arm/floppy.h @@ -25,7 +25,7 @@ #define fd_inb(port) inb((port)) #define fd_request_irq() request_irq(IRQ_FLOPPYDISK,floppy_interrupt,\ - SA_INTERRUPT,"floppy",NULL) + IRQF_DISABLED,"floppy",NULL) #define fd_free_irq() free_irq(IRQ_FLOPPYDISK,NULL) #define fd_disable_irq() disable_irq(IRQ_FLOPPYDISK) #define fd_enable_irq() enable_irq(IRQ_FLOPPYDISK) |
