Merge ../linux-2.6-watchdog-mm

[linux-drm-fsl-dcu.git] / drivers / isdn / hisax / mic.c

diff --git a/drivers/isdn/hisax/mic.c b/drivers/isdn/hisax/mic.c
index fe11f226b28539b5a0c4c40920ce8ee8f4e98821..a81d175d9f643ec0b66cfe93e17a0c144439d884 100644 (file)
--- a/drivers/isdn/hisax/mic.c
+++ b/drivers/isdn/hisax/mic.c
@@ -120,7 +120,7 @@ WriteHSCX(struct IsdnCardState *cs, int hscx, u_char offset, u_char value)
 #include "hscx_irq.c"
 
 static irqreturn_t
-mic_interrupt(int intno, void *dev_id, struct pt_regs *regs)
+mic_interrupt(int intno, void *dev_id)
 {
        struct IsdnCardState *cs = dev_id;
        u_char val;
@@ -189,7 +189,7 @@ mic_card_msg(struct IsdnCardState *cs, int mt, void *arg)
        return(0);
 }
 
-int __init
+int __devinit
 setup_mic(struct IsdnCard *card)
 {
        int bytecnt;