summaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-3.2/601-mips-remove-pci-collision-check.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2012-01-21 22:39:20 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2012-01-21 22:39:20 +0000
commit26d4e1876c9c48fd364824da7c99288cb7782fc0 (patch)
tree578ae60d6870a695219f9a4b0d321c58ecd8e286 /target/linux/brcm47xx/patches-3.2/601-mips-remove-pci-collision-check.patch
parent0665e400a0e1871d6fc6907c1cc38b374d974671 (diff)
downloadmaster-31e0f0ae-26d4e1876c9c48fd364824da7c99288cb7782fc0.tar.gz
master-31e0f0ae-26d4e1876c9c48fd364824da7c99288cb7782fc0.tar.bz2
master-31e0f0ae-26d4e1876c9c48fd364824da7c99288cb7782fc0.zip
brcm47xx: add support for pcie host controller on bcma based SoCs.
This also adds minimal support for the BCMA43224 pcie wireless card. SVN-Revision: 29843
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.patch18
1 files changed, 0 insertions, 18 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
deleted file mode 100644
index 7860ca0dd8..0000000000
--- a/target/linux/brcm47xx/patches-3.2/601-mips-remove-pci-collision-check.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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)