diff options
| author | Michael Büsch <mb@bu3sch.de> | 2010-01-07 16:06:05 +0000 |
|---|---|---|
| committer | Michael Büsch <mb@bu3sch.de> | 2010-01-07 16:06:05 +0000 |
| commit | c97341b7614c25b30f19856e300718114ab1435f (patch) | |
| tree | 0beba5487769e9bd66ddfcee2ffcb2a2896d3041 /target/linux/brcm47xx/patches-2.6.32/601-mips-remove-pci-collision-check.patch | |
| parent | d7272853a2c6d34751637be12e7d451504f02f3f (diff) | |
| download | upstream-c97341b7614c25b30f19856e300718114ab1435f.tar.gz upstream-c97341b7614c25b30f19856e300718114ab1435f.tar.bz2 upstream-c97341b7614c25b30f19856e300718114ab1435f.zip | |
bcm47xx: Add basic 2.6.32 support.
SVN-Revision: 19062
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.32/601-mips-remove-pci-collision-check.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-2.6.32/601-mips-remove-pci-collision-check.patch | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.32/601-mips-remove-pci-collision-check.patch b/target/linux/brcm47xx/patches-2.6.32/601-mips-remove-pci-collision-check.patch new file mode 100644 index 0000000000..7860ca0dd8 --- /dev/null +++ b/target/linux/brcm47xx/patches-2.6.32/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) |