summaryrefslogtreecommitdiff
path: root/drivers/pci/irq.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-01-11 04:45:50 +0100
committerIngo Molnar <mingo@elte.hu>2009-01-11 04:45:50 +0100
commite8b722f487589a1f60ca27adc695494f188d404e (patch)
treebe3897dceb9b7c0949a8917ab11eea2752375e3b /drivers/pci/irq.c
parent01d07820a0df6b6134c1bb75b1e84c9d0cdab3be (diff)
parentc59765042f53a79a7a65585042ff463b69cb248c (diff)
downloadlinux-e8b722f487589a1f60ca27adc695494f188d404e.tar.gz
linux-e8b722f487589a1f60ca27adc695494f188d404e.tar.bz2
linux-e8b722f487589a1f60ca27adc695494f188d404e.zip
Merge commit 'v2.6.29-rc1' into irq/urgent
Diffstat (limited to 'drivers/pci/irq.c')
-rw-r--r--drivers/pci/irq.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/irq.c b/drivers/pci/irq.c
index 6441dfa969a3..de01174aff06 100644
--- a/drivers/pci/irq.c
+++ b/drivers/pci/irq.c
@@ -15,7 +15,7 @@ static void pci_note_irq_problem(struct pci_dev *pdev, const char *reason)
dev_printk(KERN_ERR, &pdev->dev,
"Potentially misrouted IRQ (Bridge %s %04x:%04x)\n",
- parent->dev.bus_id, parent->vendor, parent->device);
+ dev_name(&parent->dev), parent->vendor, parent->device);
dev_printk(KERN_ERR, &pdev->dev, "%s\n", reason);
dev_printk(KERN_ERR, &pdev->dev, "Please report to linux-kernel@vger.kernel.org\n");
WARN_ON(1);