projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/home/rmk/linux-2.6-arm
[cascardo/linux.git]
/
include
/
asm-m68k
/
sun3xflop.h
diff --git
a/include/asm-m68k/sun3xflop.h
b/include/asm-m68k/sun3xflop.h
index
98a9f79
..
ca8cc41
100644
(file)
--- a/
include/asm-m68k/sun3xflop.h
+++ b/
include/asm-m68k/sun3xflop.h
@@
-208,7
+208,8
@@
static int sun3xflop_request_irq(void)
if(!once) {
once = 1;
- error = request_irq(FLOPPY_IRQ, sun3xflop_hardint, SA_INTERRUPT, "floppy", NULL);
+ error = request_irq(FLOPPY_IRQ, sun3xflop_hardint,
+ IRQF_DISABLED, "floppy", NULL);
return ((error == 0) ? 0 : -1);
} else return 0;
}