This commit was manufactured by cvs2svn to create branch 'vserver'.

[linux-2.6.git] / drivers / pci / setup-irq.c

diff --git a/drivers/pci/setup-irq.c b/drivers/pci/setup-irq.c
index c2ddc50..a251289 100644 (file)
--- a/drivers/pci/setup-irq.c
+++ b/drivers/pci/setup-irq.c
@@ -18,14 +18,6 @@
 #include <linux/cache.h>
 
 
-#define DEBUG_CONFIG 0
-#if DEBUG_CONFIG
-# define DBGC(args)     printk args
-#else
-# define DBGC(args)
-#endif
-
-
 static void __init
 pdev_fixup_irq(struct pci_dev *dev,
               u8 (*swizzle)(struct pci_dev *, u8 *),
@@ -53,7 +45,8 @@ pdev_fixup_irq(struct pci_dev *dev,
                irq = 0;
        dev->irq = irq;
 
-       DBGC((KERN_ERR "PCI fixup irq: (%s) got %d\n", dev->dev.name, dev->irq));
+       pr_debug("PCI: fixup irq: (%s) got %d\n",
+               dev->dev.kobj.name, dev->irq);
 
        /* Always tell the device, so the driver knows what is
           the real IRQ to use; the device does not use it. */
@@ -65,7 +58,7 @@ pci_fixup_irqs(u8 (*swizzle)(struct pci_dev *, u8 *),
               int (*map_irq)(struct pci_dev *, u8, u8))
 {
        struct pci_dev *dev = NULL;
-       while ((dev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
+       while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
                pdev_fixup_irq(dev, swizzle, map_irq);
        }
 }