Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / drivers / isdn / hisax / nj_s.c

diff --git a/drivers/isdn/hisax/nj_s.c b/drivers/isdn/hisax/nj_s.c
index a895dfed40e5fdcdc19d6e30e3fadcf4fb0d8dda..2344e7b3344833263ee9c42fe3db93ea3ca660f2 100644 (file)
--- 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);
@@ -277,7 +276,7 @@ setup_netjet_s(struct IsdnCard *card)
 
        for ( ;; )
        {
-               if ((dev_netjet = pci_find_device(PCI_VENDOR_ID_TIGERJET,
+               if ((dev_netjet = hisax_find_pci_device(PCI_VENDOR_ID_TIGERJET,
                        PCI_DEVICE_ID_TIGERJET_300,  dev_netjet))) {
                        ret = njs_pci_probe(dev_netjet, cs);
                        if (!ret)