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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
asm-m68k
/
floppy.h
diff --git
a/include/asm-m68k/floppy.h
b/include/asm-m68k/floppy.h
index
63a05ed
..
45dc908
100644
(file)
--- a/
include/asm-m68k/floppy.h
+++ b/
include/asm-m68k/floppy.h
@@
-17,8
+17,7
@@
#include <linux/vmalloc.h>
#include <linux/vmalloc.h>
-asmlinkage irqreturn_t floppy_hardint(int irq, void *dev_id,
- struct pt_regs *regs);
+asmlinkage irqreturn_t floppy_hardint(int irq, void *dev_id);
/* constants... */
/* constants... */
@@
-88,8
+87,8
@@
static __inline__ void fd_outb(unsigned char value, int port)
static int fd_request_irq(void)
{
if(MACH_IS_Q40)
static int fd_request_irq(void)
{
if(MACH_IS_Q40)
- return request_irq(FLOPPY_IRQ, floppy_hardint,
SA_INTERRUPT,
-
"floppy", floppy_hardint);
+ return request_irq(FLOPPY_IRQ, floppy_hardint,
+
IRQF_DISABLED,
"floppy", floppy_hardint);
else if(MACH_IS_SUN3X)
return sun3xflop_request_irq();
return -ENXIO;
else if(MACH_IS_SUN3X)
return sun3xflop_request_irq();
return -ENXIO;
@@
-184,8
+183,7
@@
static void fd_disable_dma(void)
/* this is the only truly Q40 specific function */
/* this is the only truly Q40 specific function */
-asmlinkage irqreturn_t floppy_hardint(int irq, void *dev_id,
- struct pt_regs *regs)
+asmlinkage irqreturn_t floppy_hardint(int irq, void *dev_id)
{
register unsigned char st;
{
register unsigned char st;
@@
-198,7
+196,7
@@
asmlinkage irqreturn_t floppy_hardint(int irq, void *dev_id,
static int dma_wait=0;
#endif
if(!doing_pdma) {
static int dma_wait=0;
#endif
if(!doing_pdma) {
- floppy_interrupt(irq, dev_id
, regs
);
+ floppy_interrupt(irq, dev_id);
return IRQ_HANDLED;
}
return IRQ_HANDLED;
}
@@
-246,7
+244,7
@@
asmlinkage irqreturn_t floppy_hardint(int irq, void *dev_id,
dma_wait=0;
#endif
doing_pdma = 0;
dma_wait=0;
#endif
doing_pdma = 0;
- floppy_interrupt(irq, dev_id
, regs
);
+ floppy_interrupt(irq, dev_id);
return IRQ_HANDLED;
}
#ifdef TRACE_FLPY_INT
return IRQ_HANDLED;
}
#ifdef TRACE_FLPY_INT