diff --git a/[refs] b/[refs] index a1a5c28db8df..942eb6e33587 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ecf36501bc4ad399e6df2e0bdaa513a2d510b7ec +refs/heads/master: f14e3136509e3825a83f6689cb709f41dfacea47 diff --git a/trunk/arch/i386/pci/i386.c b/trunk/arch/i386/pci/i386.c index 43005f044424..bcd2f94b732c 100644 --- a/trunk/arch/i386/pci/i386.c +++ b/trunk/arch/i386/pci/i386.c @@ -246,8 +246,8 @@ int pcibios_enable_resources(struct pci_dev *dev, int mask) continue; if (!r->start && r->end) { printk(KERN_ERR "PCI: Device %s not available " - "because of resource collisions\n", - pci_name(dev)); + "because of resource %d collisions\n", + pci_name(dev), idx); return -EINVAL; } if (r->flags & IORESOURCE_IO)