git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
[pandora-kernel.git]
/
arch
/
powerpc
/
include
/
asm
/
floppy.h
diff --git
a/arch/powerpc/include/asm/floppy.h
b/arch/powerpc/include/asm/floppy.h
index
24bd34c
..
936a904
100644
(file)
--- a/
arch/powerpc/include/asm/floppy.h
+++ b/
arch/powerpc/include/asm/floppy.h
@@
-108,10
+108,10
@@
static int fd_request_irq(void)
{
if (can_use_virtual_dma)
return request_irq(FLOPPY_IRQ, floppy_hardint,
{
if (can_use_virtual_dma)
return request_irq(FLOPPY_IRQ, floppy_hardint,
-
IRQF_DISABLED
, "floppy", NULL);
+
0
, "floppy", NULL);
else
return request_irq(FLOPPY_IRQ, floppy_interrupt,
else
return request_irq(FLOPPY_IRQ, floppy_interrupt,
-
IRQF_DISABLED
, "floppy", NULL);
+
0
, "floppy", NULL);
}
static int vdma_dma_setup(char *addr, unsigned long size, int mode, int io)
}
static int vdma_dma_setup(char *addr, unsigned long size, int mode, int io)