commented early_printk patch because of rejects.

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

diff --git a/drivers/net/wireless/orinoco_tmd.c b/drivers/net/wireless/orinoco_tmd.c
index bffb4c9..2a1da0b 100644 (file)
--- a/drivers/net/wireless/orinoco_tmd.c
+++ b/drivers/net/wireless/orinoco_tmd.c
@@ -128,7 +128,7 @@ static int orinoco_tmd_init_one(struct pci_dev *pdev,
 
        printk(KERN_DEBUG
               "Detected Orinoco/Prism2 TMD device at %s irq:%d, io addr:0x%lx\n",
-              pdev->slot_name, pdev->irq, pccard_ioaddr);
+              pci_name(pdev), pdev->irq, pccard_ioaddr);
 
        hermes_struct_init(&(priv->hw), dev->base_addr,
                        HERMES_IO, HERMES_16BIT_REGSPACING);
@@ -190,7 +190,7 @@ static void __devexit orinoco_tmd_remove_one(struct pci_dev *pdev)
 }
 
 
-static struct pci_device_id orinoco_tmd_pci_id_table[] __devinitdata = {
+static struct pci_device_id orinoco_tmd_pci_id_table[] = {
        {0x15e8, 0x0131, PCI_ANY_ID, PCI_ANY_ID,},      /* NDC and OEMs, e.g. pheecom */
        {0,},
 };