Remove files now present upstream in files-2.6.25 (This is mostly just drivers/ssb...
[openwrt/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 Index: linux-2.6.25.1/arch/mips/pci/pci.c
6 ===================================================================
7 --- linux-2.6.25.1.orig/arch/mips/pci/pci.c 2008-05-08 22:37:55.000000000 +0100
8 +++ linux-2.6.25.1/arch/mips/pci/pci.c 2008-05-09 07:39:55.000000000 +0100
9 @@ -182,12 +182,10 @@ static int pcibios_enable_resources(stru
10 if ((idx == PCI_ROM_RESOURCE) &&
11 (!(r->flags & IORESOURCE_ROM_ENABLE)))
12 continue;
13 - if (!r->start && r->end) {
14 - printk(KERN_ERR "PCI: Device %s not available "
15 - "because of resource collisions\n",
16 + if (!r->start && r->end)
17 + printk(KERN_WARNING "PCI: Device %s resource"
18 + "collisions detected. Ignoring...\n",
19 pci_name(dev));
20 - return -EINVAL;
21 - }
22 if (r->flags & IORESOURCE_IO)
23 cmd |= PCI_COMMAND_IO;
24 if (r->flags & IORESOURCE_MEM)