Merge branch 'for-linus' of git://gitorious.org/linux-omap-dss2/linux

[cascardo/linux.git] / drivers / isdn / hisax / isurf.c

diff --git a/drivers/isdn/hisax/isurf.c b/drivers/isdn/hisax/isurf.c
index 715a1a8..ca41617 100644 (file)
--- a/drivers/isdn/hisax/isurf.c
+++ b/drivers/isdn/hisax/isurf.c
@@ -17,8 +17,6 @@
 #include "isdnl1.h"
 #include <linux/isapnp.h>
 
-extern const char *CardType[];
-
 static const char *ISurf_revision = "$Revision: 1.12.2.4 $";
 
 #define byteout(addr,val) outb(val,addr)
@@ -83,7 +81,7 @@ WriteISAR(struct IsdnCardState *cs, int mode, u_char offset, u_char value)
 }
 
 static irqreturn_t
-isurf_interrupt(int intno, void *dev_id, struct pt_regs *regs)
+isurf_interrupt(int intno, void *dev_id)
 {
        struct IsdnCardState *cs = dev_id;
        u_char val;
@@ -251,22 +249,19 @@ setup_isurf(struct IsdnCard *card)
                        return(0);
                }
 #else
-               printk(KERN_WARNING "HiSax: %s port/mem not set\n",
-                       CardType[card->typ]);
+               printk(KERN_WARNING "HiSax: Siemens I-Surf port/mem not set\n");
                return (0);
 #endif
        }
        if (!request_region(cs->hw.isurf.reset, 1, "isurf isdn")) {
                printk(KERN_WARNING
-                       "HiSax: %s config port %x already in use\n",
-                       CardType[card->typ],
+                       "HiSax: Siemens I-Surf config port %x already in use\n",
                        cs->hw.isurf.reset);
                        return (0);
        }
        if (!request_region(cs->hw.isurf.phymem, ISURF_IOMEM_SIZE, "isurf iomem")) {
-               printk(KERN_WARNING
-                       "HiSax: %s memory region %lx-%lx already in use\n",
-                       CardType[card->typ],
+               printk(KERN_WARNING "HiSax: Siemens I-Surf memory region "
+                       "%lx-%lx already in use\n",
                        cs->hw.isurf.phymem,
                        cs->hw.isurf.phymem + ISURF_IOMEM_SIZE);
                release_region(cs->hw.isurf.reset, 1);