commented early_printk patch because of rejects.

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

diff --git a/drivers/net/hamachi.c b/drivers/net/hamachi.c
index 6f6c735..a4ad424 100644 (file)
--- a/drivers/net/hamachi.c
+++ b/drivers/net/hamachi.c
@@ -1872,7 +1872,7 @@ static int netdev_ethtool_ioctl(struct net_device *dev, void *useraddr)
                struct ethtool_drvinfo info = {ETHTOOL_GDRVINFO};
                strcpy(info.driver, DRV_NAME);
                strcpy(info.version, DRV_VERSION);
-               strcpy(info.bus_info, np->pci_dev->slot_name);
+               strcpy(info.bus_info, pci_name(np->pci_dev));
                if (copy_to_user(useraddr, &info, sizeof(info)))
                        return -EFAULT;
                return 0;
@@ -1982,7 +1982,7 @@ static void __devexit hamachi_remove_one (struct pci_dev *pdev)
        }
 }
 
-static struct pci_device_id hamachi_pci_tbl[] __initdata = {
+static struct pci_device_id hamachi_pci_tbl[] = {
        { 0x1318, 0x0911, PCI_ANY_ID, PCI_ANY_ID, },
        { 0, }
 };