diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-21 15:54:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-21 15:54:34 -0700 |
| commit | abe834c8a5d7e55ee12c0c8c7a5308b2c5cba95d (patch) | |
| tree | 9036de45ce80e149af12a7ceabd194940319fa51 /drivers/isdn/hisax/isurf.c | |
| parent | e16b27816462de700f9508d86954410c41105dc2 (diff) | |
| parent | 8349304d12cf1313bdbd6eb2083701d86809be24 (diff) | |
Merge branch 'isdn-cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6
* 'isdn-cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6:
[ISDN] Hisax: eliminate many unnecessary references to CardType[]
[ISDN] HiSax: modularization prep
Diffstat (limited to 'drivers/isdn/hisax/isurf.c')
| -rw-r--r-- | drivers/isdn/hisax/isurf.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/drivers/isdn/hisax/isurf.c b/drivers/isdn/hisax/isurf.c index 55de0695354..ca4161798cd 100644 --- 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) @@ -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); |