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-sparc
/
floppy.h
diff --git
a/include/asm-sparc/floppy.h
b/include/asm-sparc/floppy.h
index
c53b332
..
9073c84
100644
(file)
--- a/
include/asm-sparc/floppy.h
+++ b/
include/asm-sparc/floppy.h
@@
-262,7
+262,7
@@
static __inline__ void sun_fd_enable_dma(void)
}
/* Our low-level entry point in arch/sparc/kernel/entry.S */
-irqreturn_t floppy_hardint(int irq, void *unused
, struct pt_regs *regs
);
+irqreturn_t floppy_hardint(int irq, void *unused);
static int sun_fd_request_irq(void)
{