summaryrefslogtreecommitdiff
path: root/target/linux/brcm47xx/patches-2.6.36/601-mips-remove-pci-collision-check.patch
diff options
context:
space:
mode:
authorhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-10-06 20:11:03 +0000
committerhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-10-06 20:11:03 +0000
commitd8d08ca04082a7e1a10e7727ab6effa5f7b91bca (patch)
tree045e7b18b8430bb864d6db8ade6d7da622d3c40e /target/linux/brcm47xx/patches-2.6.36/601-mips-remove-pci-collision-check.patch
parentf2f016ef99cdc948254d68c015cb5b95e02c1a34 (diff)
brcm47xx: add patches for kernel 2.6.36
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23278 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.36/601-mips-remove-pci-collision-check.patch')
-rw-r--r--target/linux/brcm47xx/patches-2.6.36/601-mips-remove-pci-collision-check.patch18
1 files changed, 18 insertions, 0 deletions
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
index 0000000000..7860ca0dd8
--- /dev/null
+++ b/target/linux/brcm47xx/patches-2.6.36/601-mips-remove-pci-collision-check.patch
@@ -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)