From 2c5034b6dd2907c207e5f711aa3ad120c6c2093b Mon Sep 17 00:00:00 2001 From: Chuck Ebbert Date: Tue, 10 Apr 2007 10:25:44 -0400 Subject: [PATCH] --- yaml --- r: 53359 b: refs/heads/master c: f14e3136509e3825a83f6689cb709f41dfacea47 h: refs/heads/master i: 53357: 9944eb173216e6b7dde121ce6729cad146858299 53355: ea27ddd30f65bc63442481a059aa35fd71ad6cfb 53351: 2b862f2ce5c661499fbb3382c21c49bfe09610fc 53343: c004f0b6a06feab3abac516f70b06483db52509d v: v3 --- [refs] | 2 +- trunk/arch/i386/pci/i386.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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)