diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2010-03-02 21:16:18 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2010-03-02 21:16:18 +0000 |
| commit | 141d53ad0772cc875c3cafc8d95c3bf3a76ee35c (patch) | |
| tree | ca531c1e43129c144154df7736400fa9a52ed82d /target/linux/brcm47xx/patches-2.6.33/601-mips-remove-pci-collision-check.patch | |
| parent | 0e4eaea770608e157530e7190651041008c93f96 (diff) | |
| download | upstream-141d53ad0772cc875c3cafc8d95c3bf3a76ee35c.tar.gz upstream-141d53ad0772cc875c3cafc8d95c3bf3a76ee35c.tar.bz2 upstream-141d53ad0772cc875c3cafc8d95c3bf3a76ee35c.zip | |
brcm47xx: add support for kernel 2.6.33
Thanks to acoul and tripolar
SVN-Revision: 19955
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.33/601-mips-remove-pci-collision-check.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-2.6.33/601-mips-remove-pci-collision-check.patch | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.33/601-mips-remove-pci-collision-check.patch b/target/linux/brcm47xx/patches-2.6.33/601-mips-remove-pci-collision-check.patch new file mode 100644 index 0000000000..7860ca0dd8 --- /dev/null +++ b/target/linux/brcm47xx/patches-2.6.33/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) |