Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 53359
b: refs/heads/master
c: f14e313
h: refs/heads/master
i:
  53357: 9944eb1
  53355: ea27ddd
  53351: 2b862f2
  53343: c004f0b
v: v3
  • Loading branch information
Chuck Ebbert authored and Greg Kroah-Hartman committed May 3, 2007
1 parent 3c8b701 commit 2c5034b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ecf36501bc4ad399e6df2e0bdaa513a2d510b7ec
refs/heads/master: f14e3136509e3825a83f6689cb709f41dfacea47
4 changes: 2 additions & 2 deletions trunk/arch/i386/pci/i386.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 2c5034b

Please sign in to comment.