Commit be6a0e44 authored by Richard Henderson's avatar Richard Henderson

[ALPHA] Update for "name" out of struct device.

parent 2c119559
...@@ -33,6 +33,13 @@ ...@@ -33,6 +33,13 @@
# error NR_IRQS < MARVEL_NR_IRQS !!! # error NR_IRQS < MARVEL_NR_IRQS !!!
#endif #endif
/* ??? Should probably be generic. */
#ifdef CONFIG_PCI_NAMES
#define pci_pretty_name(x) ((x)->pretty_name)
#else
#define pci_pretty_name(x) ""
#endif
/* /*
* Interrupt handling. * Interrupt handling.
...@@ -378,7 +385,7 @@ marvel_map_irq(struct pci_dev *dev, u8 slot, u8 pin) ...@@ -378,7 +385,7 @@ marvel_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
PCI_SLOT(dev->devfn), PCI_SLOT(dev->devfn),
PCI_FUNC(dev->devfn), PCI_FUNC(dev->devfn),
hose->index, hose->index,
dev->dev.name); pci_pretty_name (dev));
printk(" %d message(s) from 0x%04x\n", printk(" %d message(s) from 0x%04x\n",
1 << ((msg_ctl & PCI_MSI_FLAGS_QSIZE) >> 4), 1 << ((msg_ctl & PCI_MSI_FLAGS_QSIZE) >> 4),
msg_dat); msg_dat);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment