PCI: add debug information to resource collision message

Add more information to PCI resource collision message to help with debugging.

---
 arch/i386/pci/i386.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

@@ -246,8 +246,8 @@ int pcibios_enable_resources(struct pci_
 			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)

This is a note to let you know that I've just added the patch titled

Subject: PCI: add debug information to resource collision message

to my gregkh-2.6 tree. Its filename is

pci-add-debug-information-to-resource-collision-message.patch

This tree can be found at
http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/patches/

From: Chuck Ebbert <[email protected]>
Date: Tue, 10 Apr 2007 10:25:44 -0400
Subject: PCI: add debug information to resource collision message
To: Greg KH <[email protected]>
Cc: linux-kernel <[email protected]>, [email protected]
Message-ID: <[email protected]>

Add more information to PCI resource collision message to help with debugging.

---
 arch/i386/pci/i386.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

@@ -246,8 +246,8 @@ int pcibios_enable_resources(struct pci_
 			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)

Patches currently in gregkh-2.6 which might be from [email protected] are

pci/pci-add-debug-information-to-resource-collision-message.patch