diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2011-04-07 21:38:41 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2011-04-07 21:38:41 +0000 |
commit | 340c6914a3fd1e9d29ceb09e53de8670ea121780 (patch) | |
tree | 4a1004b3b2e5ee57c968f27bda8bd75fa1315e84 /target/linux/brcm47xx/patches-2.6.38/601-mips-remove-pci-collision-check.patch | |
parent | 8f889f92505d08eaafcb7465a70cb259c72ecd60 (diff) | |
download | master-31e0f0ae-340c6914a3fd1e9d29ceb09e53de8670ea121780.tar.gz master-31e0f0ae-340c6914a3fd1e9d29ceb09e53de8670ea121780.tar.bz2 master-31e0f0ae-340c6914a3fd1e9d29ceb09e53de8670ea121780.zip |
brcm47xx: add initial support for kernel 2.6.38
SVN-Revision: 26524
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.38/601-mips-remove-pci-collision-check.patch')
-rw-r--r-- | target/linux/brcm47xx/patches-2.6.38/601-mips-remove-pci-collision-check.patch | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.38/601-mips-remove-pci-collision-check.patch b/target/linux/brcm47xx/patches-2.6.38/601-mips-remove-pci-collision-check.patch new file mode 100644 index 0000000000..7860ca0dd8 --- /dev/null +++ b/target/linux/brcm47xx/patches-2.6.38/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) |