aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-2.6.37/601-mips-remove-pci-collision-check.patch
diff options
context:
space:
mode:
authorAlexandros C. Couloumbis <alex@ozo.com>2010-11-10 19:01:07 +0000
committerAlexandros C. Couloumbis <alex@ozo.com>2010-11-10 19:01:07 +0000
commitf950840ec9336184e78d331ff54508ffadd58429 (patch)
tree1d0fc85254098d0c258b1859293b9084cc2912d3 /target/linux/brcm47xx/patches-2.6.37/601-mips-remove-pci-collision-check.patch
parent0c66bb9c5534b27bd4304ba4a65a3cc43fe77de5 (diff)
downloadupstream-f950840ec9336184e78d331ff54508ffadd58429.tar.gz
upstream-f950840ec9336184e78d331ff54508ffadd58429.tar.bz2
upstream-f950840ec9336184e78d331ff54508ffadd58429.zip
linux/brcm47xx: add preliminary 2.6.37 kernel support
SVN-Revision: 23945
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.37/601-mips-remove-pci-collision-check.patch')
-rw-r--r--target/linux/brcm47xx/patches-2.6.37/601-mips-remove-pci-collision-check.patch18
1 files changed, 18 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.37/601-mips-remove-pci-collision-check.patch b/target/linux/brcm47xx/patches-2.6.37/601-mips-remove-pci-collision-check.patch
new file mode 100644
index 0000000000..7860ca0dd8
--- /dev/null
+++ b/target/linux/brcm47xx/patches-2.6.37/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)