aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-2.6.39/601-mips-remove-pci-collision-check.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2011-05-25 19:27:08 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2011-05-25 19:27:08 +0000
commit8137e35a5dd952d3e5b57679d8f3d9627889c236 (patch)
tree0996fa6d78479a5f9649b063a80b7545e4c3a246 /target/linux/brcm47xx/patches-2.6.39/601-mips-remove-pci-collision-check.patch
parentfad3f46f0d2da16f99fd9148870a8d5ef8cc01bb (diff)
downloadupstream-8137e35a5dd952d3e5b57679d8f3d9627889c236.tar.gz
upstream-8137e35a5dd952d3e5b57679d8f3d9627889c236.tar.bz2
upstream-8137e35a5dd952d3e5b57679d8f3d9627889c236.zip
brcm47xx: initial 2.6.39 support for brcm47xx
Thank you Peter Wagner for the patch SVN-Revision: 27008
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.39/601-mips-remove-pci-collision-check.patch')
-rw-r--r--target/linux/brcm47xx/patches-2.6.39/601-mips-remove-pci-collision-check.patch18
1 files changed, 18 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.39/601-mips-remove-pci-collision-check.patch b/target/linux/brcm47xx/patches-2.6.39/601-mips-remove-pci-collision-check.patch
new file mode 100644
index 0000000000..7860ca0dd8
--- /dev/null
+++ b/target/linux/brcm47xx/patches-2.6.39/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)