diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2009-09-26 11:48:48 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2009-09-26 11:48:48 +0000 |
| commit | 9f266abb8cb79ab7d019688629d1ed035b1aa747 (patch) | |
| tree | 6735a7cc6594726fb07186dbe9d33f81ecf9f664 /target/linux/brcm47xx/patches-2.6.31/601-mips-remove-pci-collision-check.patch | |
| parent | 9c04a5f0bf8d9f63ccdc6504e304031f74a10780 (diff) | |
| download | upstream-9f266abb8cb79ab7d019688629d1ed035b1aa747.tar.gz upstream-9f266abb8cb79ab7d019688629d1ed035b1aa747.tar.bz2 upstream-9f266abb8cb79ab7d019688629d1ed035b1aa747.zip | |
[brcm47xx] add patches for kernel 2.6.31
This is completly untested. Only a compile tests with the default config was done!
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17734 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.31/601-mips-remove-pci-collision-check.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-2.6.31/601-mips-remove-pci-collision-check.patch | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.31/601-mips-remove-pci-collision-check.patch b/target/linux/brcm47xx/patches-2.6.31/601-mips-remove-pci-collision-check.patch new file mode 100644 index 0000000000..7860ca0dd8 --- /dev/null +++ b/target/linux/brcm47xx/patches-2.6.31/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) |