vserver 2.0 rc7

[linux-2.6.git] / drivers / isdn / hisax / hisax_fcpcipnp.c

diff --git a/drivers/isdn/hisax/hisax_fcpcipnp.c b/drivers/isdn/hisax/hisax_fcpcipnp.c
index e8fd6af..b4d795d 100644 (file)
--- a/drivers/isdn/hisax/hisax_fcpcipnp.c
+++ b/drivers/isdn/hisax/hisax_fcpcipnp.c
@@ -902,7 +902,7 @@ static int __devinit fcpci_probe(struct pci_dev *pdev,
        adapter->irq = pdev->irq;
 
        printk(KERN_INFO "hisax_fcpcipnp: found adapter %s at %s\n",
-              (char *) ent->driver_data, pdev->slot_name);
+              (char *) ent->driver_data, pci_name(pdev));
 
        retval = fcpcipnp_setup(adapter);
        if (retval)
@@ -1010,12 +1010,6 @@ static int __init hisax_fcpcipnp_init(void)
 #endif
        return 0;
 
-#if !defined(CONFIG_HOTPLUG) || defined(MODULE)
- out_unregister_isapnp:
-#ifdef __ISAPNP__
-       pnp_unregister_driver(&fcpnp_driver);
-#endif
-#endif
  out_unregister_pci:
        pci_unregister_driver(&fcpci_driver);
  out: