Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / drivers / isdn / hisax / saphir.c

diff --git a/drivers/isdn/hisax/saphir.c b/drivers/isdn/hisax/saphir.c
index 821776e1561acb63ad9b5ad1c062c97bce6298de..b34a81d655b8255d5cb506196ad39df7968fb199 100644 (file)
--- a/drivers/isdn/hisax/saphir.c
+++ b/drivers/isdn/hisax/saphir.c
@@ -18,7 +18,6 @@
 #include "hscx.h"
 #include "isdnl1.h"
 
-extern const char *CardType[];
 static char *saphir_rev = "$Revision: 1.10.2.4 $";
 
 #define byteout(addr,val) outb(val,addr)
@@ -117,7 +116,7 @@ WriteHSCX(struct IsdnCardState *cs, int hscx, u_char offset, u_char value)
 #include "hscx_irq.c"
 
 static irqreturn_t
-saphir_interrupt(int intno, void *dev_id, struct pt_regs *regs)
+saphir_interrupt(int intno, void *dev_id)
 {
        struct IsdnCardState *cs = dev_id;
        u_char val;
@@ -241,7 +240,7 @@ saphir_card_msg(struct IsdnCardState *cs, int mt, void *arg)
 }
 
 
-int __init
+int __devinit
 setup_saphir(struct IsdnCard *card)
 {
        struct IsdnCardState *cs = card->cs;
@@ -260,15 +259,14 @@ setup_saphir(struct IsdnCard *card)
        cs->irq = card->para[0];
        if (!request_region(cs->hw.saphir.cfg_reg, 6, "saphir")) {
                printk(KERN_WARNING
-                       "HiSax: %s config port %x-%x already in use\n",
-                       CardType[card->typ],
+                       "HiSax: HST Saphir config port %x-%x already in use\n",
                        cs->hw.saphir.cfg_reg,
                        cs->hw.saphir.cfg_reg + 5);
                return (0);
        }
 
-       printk(KERN_INFO "HiSax: %s config irq:%d io:0x%X\n",
-               CardType[cs->typ], cs->irq, cs->hw.saphir.cfg_reg);
+       printk(KERN_INFO "HiSax: HST Saphir config irq:%d io:0x%X\n",
+              cs->irq, cs->hw.saphir.cfg_reg);
 
        setup_isac(cs);
        cs->hw.saphir.timer.function = (void *) SaphirWatchDog;