kernel: refresh patches for kernel 3.0-rc5
[openwrt.git] / target / linux / brcm47xx / patches-3.0 / 601-mips-remove-pci-collision-check.patch
1 --- a/arch/mips/pci/pci.c
2 +++ b/arch/mips/pci/pci.c
3 @@ -185,12 +185,10 @@ static int pcibios_enable_resources(stru
4 if ((idx == PCI_ROM_RESOURCE) &&
5 (!(r->flags & IORESOURCE_ROM_ENABLE)))
6 continue;
7 - if (!r->start && r->end) {
8 - printk(KERN_ERR "PCI: Device %s not available "
9 - "because of resource collisions\n",
10 + if (!r->start && r->end)
11 + printk(KERN_WARNING "PCI: Device %s resource"
12 + "collisions detected. Ignoring...\n",
13 pci_name(dev));
14 - return -EINVAL;
15 - }
16 if (r->flags & IORESOURCE_IO)
17 cmd |= PCI_COMMAND_IO;
18 if (r->flags & IORESOURCE_MEM)
This page took 0.038694 seconds and 5 git commands to generate.