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]
/
drivers
/
isdn
/
hisax
/
elsa.c
diff --git
a/drivers/isdn/hisax/elsa.c
b/drivers/isdn/hisax/elsa.c
index
3b3e318
..
fab3e4e
100644
(file)
--- a/
drivers/isdn/hisax/elsa.c
+++ b/
drivers/isdn/hisax/elsa.c
@@
-282,7
+282,7
@@
TimerRun(struct IsdnCardState *cs)
#include "hscx_irq.c"
static irqreturn_t
#include "hscx_irq.c"
static irqreturn_t
-elsa_interrupt(int intno, void *dev_id
, struct pt_regs *regs
)
+elsa_interrupt(int intno, void *dev_id)
{
struct IsdnCardState *cs = dev_id;
u_long flags;
{
struct IsdnCardState *cs = dev_id;
u_long flags;
@@
-361,7
+361,7
@@
elsa_interrupt(int intno, void *dev_id, struct pt_regs *regs)
}
static irqreturn_t
}
static irqreturn_t
-elsa_interrupt_ipac(int intno, void *dev_id
, struct pt_regs *regs
)
+elsa_interrupt_ipac(int intno, void *dev_id)
{
struct IsdnCardState *cs = dev_id;
u_long flags;
{
struct IsdnCardState *cs = dev_id;
u_long flags;