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]
/
arch
/
m68k
/
amiga
/
cia.c
diff --git
a/arch/m68k/amiga/cia.c
b/arch/m68k/amiga/cia.c
index
dbad300
..
7a20058
100644
(file)
--- a/
arch/m68k/amiga/cia.c
+++ b/
arch/m68k/amiga/cia.c
@@
-82,7
+82,7
@@
unsigned char cia_able_irq(struct ciabase *base, unsigned char mask)
return old;
}
return old;
}
-static irqreturn_t cia_handler(int irq, void *dev_id
, struct pt_regs *fp
)
+static irqreturn_t cia_handler(int irq, void *dev_id)
{
struct ciabase *base = (struct ciabase *)dev_id;
int mach_irq;
{
struct ciabase *base = (struct ciabase *)dev_id;
int mach_irq;
@@
-93,7
+93,7
@@
static irqreturn_t cia_handler(int irq, void *dev_id, struct pt_regs *fp)
amiga_custom.intreq = base->int_mask;
for (; ints; mach_irq++, ints >>= 1) {
if (ints & 1)
amiga_custom.intreq = base->int_mask;
for (; ints; mach_irq++, ints >>= 1) {
if (ints & 1)
- m68k_handle_int(mach_irq
, fp
);
+ m68k_handle_int(mach_irq);
}
return IRQ_HANDLED;
}
}
return IRQ_HANDLED;
}