aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-2.6.33/601-mips-remove-pci-collision-check.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2010-03-02 21:16:18 +0000
committerHauke Mehrtens <hauke@openwrt.org>2010-03-02 21:16:18 +0000
commite2509a6038c452dac374e7826156450128b45706 (patch)
tree7cba8db872ecc919db657ccae8cc6efa0b5307a8 /target/linux/brcm47xx/patches-2.6.33/601-mips-remove-pci-collision-check.patch
parent0000020d9ea7f8a896edcaab680d4f56619de897 (diff)
downloadupstream-e2509a6038c452dac374e7826156450128b45706.tar.gz
upstream-e2509a6038c452dac374e7826156450128b45706.tar.bz2
upstream-e2509a6038c452dac374e7826156450128b45706.zip
brcm47xx: add support for kernel 2.6.33
Thanks to acoul and tripolar git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19955 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.33/601-mips-remove-pci-collision-check.patch')
-rw-r--r--target/linux/brcm47xx/patches-2.6.33/601-mips-remove-pci-collision-check.patch18
1 files changed, 18 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.33/601-mips-remove-pci-collision-check.patch b/target/linux/brcm47xx/patches-2.6.33/601-mips-remove-pci-collision-check.patch
new file mode 100644
index 0000000000..7860ca0dd8
--- /dev/null
+++ b/target/linux/brcm47xx/patches-2.6.33/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)