vserver 1.9.5.x5

[linux-2.6.git] / arch / i386 / pci / pcbios.c

diff --git a/arch/i386/pci/pcbios.c b/arch/i386/pci/pcbios.c
index 700188d..d0f3c2d 100644 (file)
--- a/arch/i386/pci/pcbios.c
+++ b/arch/i386/pci/pcbios.c
@@ -365,7 +365,7 @@ void __devinit pcibios_sort(void)
                idx = found = 0;
                while (pci_bios_find_device(dev->vendor, dev->device, idx, &bus, &devfn) == PCIBIOS_SUCCESSFUL) {
                        idx++;
-                       for (ln=pci_devices.next; ln != &pci_devices; ln=ln->next) {
+                       list_for_each(ln, &pci_devices) {
                                d = pci_dev_g(ln);
                                if (d->bus->number == bus && d->devfn == devfn) {
                                        list_del(&d->global_list);
@@ -385,8 +385,8 @@ void __devinit pcibios_sort(void)
                        }
                }
                if (!found) {
-                       printk(KERN_WARNING "PCI: Device %02x:%02x not found by BIOS\n",
-                               dev->bus->number, dev->devfn);
+                       printk(KERN_WARNING "PCI: Device %s not found by BIOS\n",
+                               pci_name(dev));
                        list_del(&dev->global_list);
                        list_add_tail(&dev->global_list, &sorted_devices);
                }