Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

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

diff --git a/drivers/isdn/hisax/mic.c b/drivers/isdn/hisax/mic.c
index 3ac4484a4886bf1757c51993f843d536f7f898d4..253943029d254b39183ef25199b1e670f639e604 100644 (file)
--- a/drivers/isdn/hisax/mic.c
+++ b/drivers/isdn/hisax/mic.c
@@ -16,9 +16,7 @@
 #include "hscx.h"
 #include "isdnl1.h"
 
-extern const char *CardType[];
-
-const char *mic_revision = "$Revision: 1.12.2.4 $";
+static const char *mic_revision = "$Revision: 1.12.2.4 $";
 
 #define byteout(addr,val) outb(val,addr)
 #define bytein(addr) inb(addr)
@@ -120,7 +118,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;
@@ -157,7 +155,7 @@ mic_interrupt(int intno, void *dev_id, struct pt_regs *regs)
        return IRQ_HANDLED;
 }
 
-void
+static void
 release_io_mic(struct IsdnCardState *cs)
 {
        int bytecnt = 8;
@@ -189,7 +187,7 @@ mic_card_msg(struct IsdnCardState *cs, int mt, void *arg)
        return(0);
 }
 
-int __init
+int __devinit
 setup_mic(struct IsdnCard *card)
 {
        int bytecnt;
@@ -210,8 +208,7 @@ setup_mic(struct IsdnCard *card)
 
        if (!request_region(cs->hw.mic.cfg_reg, bytecnt, "mic isdn")) {
                printk(KERN_WARNING
-                      "HiSax: %s config port %x-%x already in use\n",
-                      CardType[card->typ],
+                      "HiSax: ith mic config port %x-%x already in use\n",
                       cs->hw.mic.cfg_reg,
                       cs->hw.mic.cfg_reg + bytecnt);
                return (0);