summaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-3.0/601-mips-remove-pci-collision-check.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2011-06-18 15:24:44 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2011-06-18 15:24:44 +0000
commit75f9e0c615d2fe50259ac6bc96e2b849fc975ea7 (patch)
treef0dc7985c9d6b4d5249e51c4a2371fe84806235d /target/linux/brcm47xx/patches-3.0/601-mips-remove-pci-collision-check.patch
parent2e1b73912d4eb749901c4f0ab248b64339895cb1 (diff)
downloadmaster-31e0f0ae-75f9e0c615d2fe50259ac6bc96e2b849fc975ea7.tar.gz
master-31e0f0ae-75f9e0c615d2fe50259ac6bc96e2b849fc975ea7.tar.bz2
master-31e0f0ae-75f9e0c615d2fe50259ac6bc96e2b849fc975ea7.zip
brcm47xx: add support for kernel 3.0
SVN-Revision: 27217
Diffstat (limited to 'target/linux/brcm47xx/patches-3.0/601-mips-remove-pci-collision-check.patch')
-rw-r--r--target/linux/brcm47xx/patches-3.0/601-mips-remove-pci-collision-check.patch18
1 files changed, 18 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/patches-3.0/601-mips-remove-pci-collision-check.patch b/target/linux/brcm47xx/patches-3.0/601-mips-remove-pci-collision-check.patch
new file mode 100644
index 0000000000..7860ca0dd8
--- /dev/null
+++ b/target/linux/brcm47xx/patches-3.0/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)