Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=f14e3136509e3825a83f6689cb709f41dfacea47
Commit:     f14e3136509e3825a83f6689cb709f41dfacea47
Parent:     ecf36501bc4ad399e6df2e0bdaa513a2d510b7ec
Author:     Chuck Ebbert <[EMAIL PROTECTED]>
AuthorDate: Tue Apr 10 10:25:44 2007 -0400
Committer:  Greg Kroah-Hartman <[EMAIL PROTECTED]>
CommitDate: Wed May 2 19:02:38 2007 -0700

    PCI: add debug information to resource collision message
    
    Add more information to PCI resource collision message
    to help with debugging.
    
    Signed-off-by: Chuck Ebbert <[EMAIL PROTECTED]>
    Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
---
 arch/i386/pci/i386.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/i386/pci/i386.c b/arch/i386/pci/i386.c
index 43005f0..bcd2f94 100644
--- a/arch/i386/pci/i386.c
+++ b/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)
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to