diff options
author | acoul <acoul@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-04-15 20:50:50 +0000 |
---|---|---|
committer | acoul <acoul@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-04-15 20:50:50 +0000 |
commit | 7d1583626feb64482457250252884a1730727ed3 (patch) | |
tree | e9909a06539fedbcf58ccb1b179264fde036a179 /target/linux/brcm47xx/patches-2.6.34/601-mips-remove-pci-collision-check.patch | |
parent | 108934678cea46fab70cef7d3414c83c6d361b94 (diff) |
brcm47xx: add preliminary 2.6.34 support
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20888 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.34/601-mips-remove-pci-collision-check.patch')
-rw-r--r-- | target/linux/brcm47xx/patches-2.6.34/601-mips-remove-pci-collision-check.patch | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.34/601-mips-remove-pci-collision-check.patch b/target/linux/brcm47xx/patches-2.6.34/601-mips-remove-pci-collision-check.patch new file mode 100644 index 0000000000..7860ca0dd8 --- /dev/null +++ b/target/linux/brcm47xx/patches-2.6.34/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) |