20 lines
692 B
Diff
20 lines
692 B
Diff
|
diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c
|
||
|
|
--- a/arch/mips/pci/pci.c
|
||
|
|
+++ b/arch/mips/pci/pci.c
|
||
|
|
@@ -207,12 +207,10 @@ static int pcibios_enable_resources(struct pci_dev *dev, int mask)
|
||
|
|
if ((idx == PCI_ROM_RESOURCE) &&
|
||
|
|
(!(r->flags & IORESOURCE_ROM_ENABLE)))
|
||
|
|
continue;
|
||
|
|
- if (!r->start && r->end) {
|
||
|
|
- printk(KERN_ERR "PCI: Device %s not available "
|
||
|
|
- "because of resource collisions\n",
|
||
|
|
+ if (!r->start && r->end)
|
||
|
|
+ printk(KERN_WARNING "PCI: Device %s resource"
|
||
|
|
+ "collisions detected. Ignoring...\n",
|
||
|
|
pci_name(dev));
|
||
|
|
- return -EINVAL;
|
||
|
|
- }
|
||
|
|
if (r->flags & IORESOURCE_IO)
|
||
|
|
cmd |= PCI_COMMAND_IO;
|
||
|
|
if (r->flags & IORESOURCE_MEM)
|