diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 06:20:23 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 06:20:23 -0400 |
| commit | cd569ef5d6ff9f43e9504f1ffc7fdbe356518149 (patch) | |
| tree | 9a4ab5e600fd09e991aa1fbb69adb1c7950898a4 /drivers/pci/setup-irq.c | |
| parent | 6879827f4e08da219c99b91e4e1d793a924103e3 (diff) | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
Merge branch 'linus' into x86/urgent
Diffstat (limited to 'drivers/pci/setup-irq.c')
| -rw-r--r-- | drivers/pci/setup-irq.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/pci/setup-irq.c b/drivers/pci/setup-irq.c index 05ca2ed9eb51..aa795fd428de 100644 --- a/drivers/pci/setup-irq.c +++ b/drivers/pci/setup-irq.c | |||
| @@ -47,8 +47,7 @@ pdev_fixup_irq(struct pci_dev *dev, | |||
| 47 | } | 47 | } |
| 48 | dev->irq = irq; | 48 | dev->irq = irq; |
| 49 | 49 | ||
| 50 | pr_debug("PCI: fixup irq: (%s) got %d\n", | 50 | dev_dbg(&dev->dev, "fixup irq: got %d\n", dev->irq); |
| 51 | kobject_name(&dev->dev.kobj), dev->irq); | ||
| 52 | 51 | ||
| 53 | /* Always tell the device, so the driver knows what is | 52 | /* Always tell the device, so the driver knows what is |
| 54 | the real IRQ to use; the device does not use it. */ | 53 | the real IRQ to use; the device does not use it. */ |