diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-21 22:54:34 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-21 22:54:34 (GMT) |
| commit | abe834c8a5d7e55ee12c0c8c7a5308b2c5cba95d (patch) | |
| tree | 9036de45ce80e149af12a7ceabd194940319fa51 /drivers/isdn/hisax/telespci.c | |
| parent | e16b27816462de700f9508d86954410c41105dc2 (diff) | |
| parent | 8349304d12cf1313bdbd6eb2083701d86809be24 (diff) | |
| download | linux-abe834c8a5d7e55ee12c0c8c7a5308b2c5cba95d.tar.xz | |
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/telespci.c')
| -rw-r--r-- | drivers/isdn/hisax/telespci.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/isdn/hisax/telespci.c b/drivers/isdn/hisax/telespci.c index 4393003..28b08de 100644 --- a/drivers/isdn/hisax/telespci.c +++ b/drivers/isdn/hisax/telespci.c @@ -19,7 +19,6 @@ #include "isdnl1.h" #include <linux/pci.h> -extern const char *CardType[]; static const char *telespci_revision = "$Revision: 2.23.2.3 $"; #define ZORAN_PO_RQ_PEN 0x02000000 @@ -329,8 +328,8 @@ setup_telespci(struct IsdnCard *card) /* writel(0x00800000, cs->hw.teles0.membase + 0x200); */ printk(KERN_INFO - "HiSax: %s config irq:%d mem:%p\n", - CardType[cs->typ], cs->irq, + "HiSax: Teles PCI config irq:%d mem:%p\n", + cs->irq, cs->hw.teles0.membase); setup_isac(cs); |