remove leftover unvram directory and move the nvram.init change to package/nvram
[openwrt.git] / target / linux / brcm47xx / patches-2.6.25 / 601-mips-remove-pci-collision-check.patch
1 The SSB pcicore driver does create some MMIO resource collisions.
2 However, the pcicore PCI-fixup routine fixes these collisions afterwards.
3 Remove this sanity check for now until we find a better solution.
4 --mb
5 --- a/arch/mips/pci/pci.c
6 +++ b/arch/mips/pci/pci.c
7 @@ -182,12 +182,10 @@ static int pcibios_enable_resources(stru
8                 if ((idx == PCI_ROM_RESOURCE) &&
9                                 (!(r->flags & IORESOURCE_ROM_ENABLE)))
10                         continue;
11 -               if (!r->start && r->end) {
12 -                       printk(KERN_ERR "PCI: Device %s not available "
13 -                              "because of resource collisions\n",
14 +               if (!r->start && r->end)
15 +                       printk(KERN_WARNING "PCI: Device %s resource"
16 +                              "collisions detected. Ignoring...\n",
17                                pci_name(dev));
18 -                       return -EINVAL;
19 -               }
20                 if (r->flags & IORESOURCE_IO)
21                         cmd |= PCI_COMMAND_IO;
22                 if (r->flags & IORESOURCE_MEM)