First step to upgrade of brcm47xx to kernel version 2.6.25
[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.23.16/arch/mips/pci/pci.c
6 ===================================================================
7 --- linux-2.6.23.16.orig/arch/mips/pci/pci.c    2008-02-16 17:55:20.000000000 +0100
8 +++ linux-2.6.23.16/arch/mips/pci/pci.c 2008-02-16 17:57:39.000000000 +0100
9 @@ -177,10 +177,8 @@ static int pcibios_enable_resources(stru
10                         continue;
11  
12                 r = &dev->resource[idx];
13 -               if (!r->start && r->end) {
14 -                       printk(KERN_ERR "PCI: Device %s not available because of resource collisions\n", pci_name(dev));
15 -                       return -EINVAL;
16 -               }
17 +               if (!r->start && r->end)
18 +                       printk(KERN_WARNING "PCI: Device %s resource collisions detected. Ignoring...\n", pci_name(dev));
19                 if (r->flags & IORESOURCE_IO)
20                         cmd |= PCI_COMMAND_IO;
21                 if (r->flags & IORESOURCE_MEM)