aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-2.6.32/601-mips-remove-pci-collision-check.patch
diff options
context:
space:
mode:
authorMichael Büsch <mb@bu3sch.de>2010-01-07 16:06:05 +0000
committerMichael Büsch <mb@bu3sch.de>2010-01-07 16:06:05 +0000
commitdee16bb67ae841d8340492b7ce99155886d2dca1 (patch)
tree3834515bb4783f3c43bd1fe9852ec8fab7c5dfac /target/linux/brcm47xx/patches-2.6.32/601-mips-remove-pci-collision-check.patch
parent210ef07a746d17eed1a3c0a5fddb79607d2e1dc2 (diff)
downloadmaster-187ad058-dee16bb67ae841d8340492b7ce99155886d2dca1.tar.gz
master-187ad058-dee16bb67ae841d8340492b7ce99155886d2dca1.tar.bz2
master-187ad058-dee16bb67ae841d8340492b7ce99155886d2dca1.zip
bcm47xx: Add basic 2.6.32 support.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19062 3c298f89-4303-0410-b956-a3cf2f4a3e73
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.patch18
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)