diff options
| author | Alexandros C. Couloumbis <alex@ozo.com> | 2010-04-15 20:50:50 +0000 |
|---|---|---|
| committer | Alexandros C. Couloumbis <alex@ozo.com> | 2010-04-15 20:50:50 +0000 |
| commit | 598e0656c5f35b4b39f61d72e7bd5ec5e713245a (patch) | |
| tree | 54b1e08c5612ad56cab638208555e259a3f6fabd /target/linux/brcm47xx/patches-2.6.34/601-mips-remove-pci-collision-check.patch | |
| parent | 28718f2d5f3d97b77d005ba6b89d2d5af58a34be (diff) | |
| download | master-31e0f0ae-598e0656c5f35b4b39f61d72e7bd5ec5e713245a.tar.gz master-31e0f0ae-598e0656c5f35b4b39f61d72e7bd5ec5e713245a.tar.bz2 master-31e0f0ae-598e0656c5f35b4b39f61d72e7bd5ec5e713245a.zip | |
brcm47xx: add preliminary 2.6.34 support
SVN-Revision: 20888
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) |