commented early_printk patch because of rejects.

[linux-flexiantxendom0-3.2.10.git] / arch / v850 / kernel / rte_mb_a_pci.c

diff --git a/arch/v850/kernel/rte_mb_a_pci.c b/arch/v850/kernel/rte_mb_a_pci.c
index 316e31d..1c4d9c5 100644 (file)
--- a/arch/v850/kernel/rte_mb_a_pci.c
+++ b/arch/v850/kernel/rte_mb_a_pci.c
@@ -231,7 +231,7 @@ int __nomods_init pcibios_enable_device (struct pci_dev *dev, int mask)
                r = &dev->resource[idx];
                if (!r->start && r->end) {
                        printk(KERN_ERR "PCI: Device %s not available because "
-                              "of resource collisions\n", dev->slot_name);
+                              "of resource collisions\n", pci_name(dev));
                        return -EINVAL;
                }
                if (r->flags & IORESOURCE_IO)
@@ -241,7 +241,7 @@ int __nomods_init pcibios_enable_device (struct pci_dev *dev, int mask)
        }
        if (cmd != old_cmd) {
                printk("PCI: Enabling device %s (%04x -> %04x)\n",
-                      dev->slot_name, old_cmd, cmd);
+                      pci_name(dev), old_cmd, cmd);
                pci_write_config_word(dev, PCI_COMMAND, cmd);
        }
        return 0;