50b6fbdfe39b74e45a3919c1809b41c1f1e69d65
[openwrt/openwrt.git] / target / linux / brcm47xx / patches-2.6.28 / 601-mips-remove-pci-collision-check.patch
1 diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c
2 --- a/arch/mips/pci/pci.c
3 +++ b/arch/mips/pci/pci.c
4 @@ -207,12 +207,10 @@ static int pcibios_enable_resources(struct pci_dev *dev, int mask)
5 if ((idx == PCI_ROM_RESOURCE) &&
6 (!(r->flags & IORESOURCE_ROM_ENABLE)))
7 continue;
8 - if (!r->start && r->end) {
9 - printk(KERN_ERR "PCI: Device %s not available "
10 - "because of resource collisions\n",
11 + if (!r->start && r->end)
12 + printk(KERN_WARNING "PCI: Device %s resource"
13 + "collisions detected. Ignoring...\n",
14 pci_name(dev));
15 - return -EINVAL;
16 - }
17 if (r->flags & IORESOURCE_IO)
18 cmd |= PCI_COMMAND_IO;
19 if (r->flags & IORESOURCE_MEM)