Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/linville...

[linux-2.6] / drivers / isdn / hisax / niccy.c

diff --git a/drivers/isdn/hisax/niccy.c b/drivers/isdn/hisax/niccy.c
index 0945336c28daa61762225e324361400cf7e0d641..e5918c6fe73d09bfb99a4dc91f05ca2c4b09646b 100644 (file)
--- a/drivers/isdn/hisax/niccy.c
+++ b/drivers/isdn/hisax/niccy.c
@@ -122,8 +122,7 @@ static void WriteHSCX(struct IsdnCardState *cs, int hscx, u_char offset,
 
 #include "hscx_irq.c"
 
-static irqreturn_t niccy_interrupt(int intno, void *dev_id,
-               struct pt_regs *regs)
+static irqreturn_t niccy_interrupt(int intno, void *dev_id)
 {
        struct IsdnCardState *cs = dev_id;
        u_char val;