Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

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

diff --git a/drivers/isdn/hisax/asuscom.c b/drivers/isdn/hisax/asuscom.c
index 61e69e9c4aa98dd8cd6e925e5ec937390e105a12..1f879b500d838998969597e8af63b08ce1912fae 100644 (file)
--- a/drivers/isdn/hisax/asuscom.c
+++ b/drivers/isdn/hisax/asuscom.c
@@ -20,8 +20,6 @@
 #include "hscx.h"
 #include "isdnl1.h"
 
-extern const char *CardType[];
-
 static const char *Asuscom_revision = "$Revision: 1.14.2.4 $";
 
 #define byteout(addr,val) outb(val,addr)
@@ -346,7 +344,7 @@ setup_asuscom(struct IsdnCard *card)
                                        err = pnp_activate_dev(pnp_d);
                                        if (err<0) {
                                                printk(KERN_WARNING "%s: pnp_activate_dev ret(%d)\n",
-                                                       __FUNCTION__, err);
+                                                       __func__, err);
                                                return(0);
                                        }
                                        card->para[1] = pnp_port_start(pnp_d, 0);
@@ -376,8 +374,7 @@ setup_asuscom(struct IsdnCard *card)
        cs->irq = card->para[0];
        if (!request_region(cs->hw.asus.cfg_reg, bytecnt, "asuscom isdn")) {
                printk(KERN_WARNING
-                      "HiSax: %s config port %x-%x already in use\n",
-                      CardType[card->typ],
+                      "HiSax: ISDNLink config port %x-%x already in use\n",
                       cs->hw.asus.cfg_reg,
                       cs->hw.asus.cfg_reg + bytecnt);
                return (0);