diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2012-01-15 21:18:34 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2012-01-15 21:18:34 +0000 |
| commit | 50050af93cfeca75eed403b6d85e61fe0a85a91e (patch) | |
| tree | be16db4b392698dba45f49fc754a8c638cf414ff /target/linux/brcm47xx/patches-3.2/601-mips-remove-pci-collision-check.patch | |
| parent | f1429085fb521c455ee36dcde923f3769e229a31 (diff) | |
| download | upstream-50050af93cfeca75eed403b6d85e61fe0a85a91e.tar.gz upstream-50050af93cfeca75eed403b6d85e61fe0a85a91e.tar.bz2 upstream-50050af93cfeca75eed403b6d85e61fe0a85a91e.zip | |
brcm47xx: add support for kernel 3.2
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29756 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-3.2/601-mips-remove-pci-collision-check.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-3.2/601-mips-remove-pci-collision-check.patch | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/patches-3.2/601-mips-remove-pci-collision-check.patch b/target/linux/brcm47xx/patches-3.2/601-mips-remove-pci-collision-check.patch new file mode 100644 index 0000000000..7860ca0dd8 --- /dev/null +++ b/target/linux/brcm47xx/patches-3.2/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) |