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-sh
/
floppy.h
diff --git
a/include/asm-sh/floppy.h
b/include/asm-sh/floppy.h
index
38d7a29
..
dc1ad46
100644
(file)
--- 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)
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,
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)
}
static unsigned long dma_mem_alloc(unsigned long size)