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/nj_s.c | |
| parent | e16b27816462de700f9508d86954410c41105dc2 (diff) | |
| parent | 8349304d12cf1313bdbd6eb2083701d86809be24 (diff) | |
| download | kernel_goldelico_gta04-abe834c8a5d7e55ee12c0c8c7a5308b2c5cba95d.zip kernel_goldelico_gta04-abe834c8a5d7e55ee12c0c8c7a5308b2c5cba95d.tar.gz kernel_goldelico_gta04-abe834c8a5d7e55ee12c0c8c7a5308b2c5cba95d.tar.bz2 | |
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/nj_s.c')
| -rw-r--r-- | drivers/isdn/hisax/nj_s.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/isdn/hisax/nj_s.c b/drivers/isdn/hisax/nj_s.c index a895dfe..8d36ccc 100644 --- a/drivers/isdn/hisax/nj_s.c +++ b/drivers/isdn/hisax/nj_s.c @@ -235,8 +235,7 @@ static int __devinit njs_cs_init_rest(struct IsdnCard *card, cs->subtyp ? "TJ320" : "TJ300", cs->hw.njet.base, cs->irq); if (!request_region(cs->hw.njet.base, bytecnt, "netjet-s isdn")) { printk(KERN_WARNING - "HiSax: %s config port %#lx-%#lx already in use\n", - CardType[card->typ], + "HiSax: NETjet-S config port %#lx-%#lx already in use\n", cs->hw.njet.base, cs->hw.njet.base + bytecnt); return (0); |