git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
include
/
asm-mips
/
mach-jazz
/
floppy.h
diff --git
a/include/asm-mips/mach-jazz/floppy.h
b/include/asm-mips/mach-jazz/floppy.h
index
c9dad99
..
56e9ca6
100644
(file)
--- a/
include/asm-mips/mach-jazz/floppy.h
+++ b/
include/asm-mips/mach-jazz/floppy.h
@@
-90,7
+90,7
@@
static inline void fd_disable_irq(void)
static inline int fd_request_irq(void)
{
return request_irq(FLOPPY_IRQ, floppy_interrupt,
-
SA_INTERRUPT | SA_SAMPLE_RANDOM
, "floppy", NULL);
+
IRQF_DISABLED
, "floppy", NULL);
}
static inline void fd_free_irq(void)