brcm47xx: add patches for kernel 2.6.36
[openwrt/svn-archive/archive.git] / target / linux / brcm47xx / patches-2.6.36 / 601-mips-remove-pci-collision-check.patch
diff --git a/target/linux/brcm47xx/patches-2.6.36/601-mips-remove-pci-collision-check.patch b/target/linux/brcm47xx/patches-2.6.36/601-mips-remove-pci-collision-check.patch
new file mode 100644 (file)
index 0000000..7860ca0
--- /dev/null
@@ -0,0 +1,18 @@
+--- a/arch/mips/pci/pci.c
++++ b/arch/mips/pci/pci.c
+@@ -185,12 +185,10 @@ static int pcibios_enable_resources(stru
+               if ((idx == PCI_ROM_RESOURCE) &&
+                               (!(r->flags & IORESOURCE_ROM_ENABLE)))
+                       continue;
+-              if (!r->start && r->end) {
+-                      printk(KERN_ERR "PCI: Device %s not available "
+-                             "because of resource collisions\n",
++              if (!r->start && r->end)
++                      printk(KERN_WARNING "PCI: Device %s resource"
++                             "collisions detected. Ignoring...\n",
+                              pci_name(dev));
+-                      return -EINVAL;
+-              }
+               if (r->flags & IORESOURCE_IO)
+                       cmd |= PCI_COMMAND_IO;
+               if (r->flags & IORESOURCE_MEM)