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/sportster.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/sportster.c')
-rw-r--r-- | drivers/isdn/hisax/sportster.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/isdn/hisax/sportster.c b/drivers/isdn/hisax/sportster.c index 02209500b3b..0a53759adfa 100644 --- a/drivers/isdn/hisax/sportster.c +++ b/drivers/isdn/hisax/sportster.c @@ -18,7 +18,6 @@ #include "hscx.h" #include "isdnl1.h" -extern const char *CardType[]; static const char *sportster_revision = "$Revision: 1.16.2.4 $"; #define byteout(addr,val) outb(val,addr) @@ -192,9 +191,9 @@ get_io_range(struct IsdnCardState *cs) for (i=0;i<64;i++) { adr = cs->hw.spt.cfg_reg + i *1024; if (!request_region(adr, 8, "sportster")) { - printk(KERN_WARNING - "HiSax: %s config port %x-%x already in use\n", - CardType[cs->typ], adr, adr + 8); + printk(KERN_WARNING "HiSax: USR Sportster config port " + "%x-%x already in use\n", + adr, adr + 8); break; } } @@ -247,8 +246,8 @@ setup_sportster(struct IsdnCard *card) printk(KERN_WARNING "Sportster: wrong IRQ\n"); return(0); } - printk(KERN_INFO "HiSax: %s config irq:%d cfg:0x%X\n", - CardType[cs->typ], cs->irq, cs->hw.spt.cfg_reg); + printk(KERN_INFO "HiSax: USR Sportster config irq:%d cfg:0x%X\n", + cs->irq, cs->hw.spt.cfg_reg); setup_isac(cs); cs->readisac = &ReadISAC; cs->writeisac = &WriteISAC; |