commented early_printk patch because of rejects.

[linux-flexiantxendom0-3.2.10.git] / drivers / net / ioc3-eth.c

diff --git a/drivers/net/ioc3-eth.c b/drivers/net/ioc3-eth.c
index 63ce285..4cdcc16 100644 (file)
--- a/drivers/net/ioc3-eth.c
+++ b/drivers/net/ioc3-eth.c
@@ -1453,7 +1453,7 @@ static int __devinit ioc3_probe(struct pci_dev *pdev,
        ioc3 = (struct ioc3 *) ioremap(ioc3_base, ioc3_size);
        if (!ioc3) {
                printk(KERN_CRIT "ioc3eth(%s): ioremap failed, goodbye.\n",
-                      pdev->slot_name);
+                      pci_name(pdev));
                err = -ENOMEM;
                goto out_res;
        }
@@ -1473,7 +1473,7 @@ static int __devinit ioc3_probe(struct pci_dev *pdev,
 
        if (ip->phy == -1) {
                printk(KERN_CRIT "ioc3-eth(%s): Didn't find a PHY, goodbye.\n",
-                      pdev->slot_name);
+                      pci_name(pdev));
                err = -ENODEV;
                goto out_stop;
        }
@@ -1528,7 +1528,7 @@ static void __devexit ioc3_remove_one (struct pci_dev *pdev)
        kfree(dev);
 }
 
-static struct pci_device_id ioc3_pci_tbl[] __devinitdata = {
+static struct pci_device_id ioc3_pci_tbl[] = {
        { PCI_VENDOR_ID_SGI, PCI_DEVICE_ID_SGI_IOC3, PCI_ANY_ID, PCI_ANY_ID },
        { 0 }
 };