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 Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
include
/
asm-x86_64
/
mach-xen
/
asm
/
floppy.h
diff --git
a/include/asm-x86_64/mach-xen/asm/floppy.h
b/include/asm-x86_64/mach-xen/asm/floppy.h
index
d1027d8
..
e7893c5
100644
(file)
--- a/
include/asm-x86_64/mach-xen/asm/floppy.h
+++ b/
include/asm-x86_64/mach-xen/asm/floppy.h
@@
-134,8
+134,8
@@
static int vdma_get_dma_residue(unsigned int dummy)
static int fd_request_irq(void)
{
- return request_irq(FLOPPY_IRQ, floppy_hardint,
SA_INTERRUPT,
-
"floppy", NULL);
+ return request_irq(FLOPPY_IRQ, floppy_hardint,
+
IRQF_DISABLED,
"floppy", NULL);
}
#if 0