aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-2.6.35/601-mips-remove-pci-collision-check.patch
diff options
context:
space:
mode:
authorAlexandros C. Couloumbis <alex@ozo.com>2010-06-08 16:58:06 +0000
committerAlexandros C. Couloumbis <alex@ozo.com>2010-06-08 16:58:06 +0000
commitcfa9a1f6d6874f3cd1601e15664281c5184ce8ea (patch)
tree35ec283e7509baa64df1198dc1daef4a8d88e482 /target/linux/brcm47xx/patches-2.6.35/601-mips-remove-pci-collision-check.patch
parentce6b70119c97a254277a07a169501018fb7c3805 (diff)
downloadupstream-cfa9a1f6d6874f3cd1601e15664281c5184ce8ea.tar.gz
upstream-cfa9a1f6d6874f3cd1601e15664281c5184ce8ea.tar.bz2
upstream-cfa9a1f6d6874f3cd1601e15664281c5184ce8ea.zip
brcm47xx: add kernel 2.6.35 preliminary support
SVN-Revision: 21707
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.35/601-mips-remove-pci-collision-check.patch')
-rw-r--r--target/linux/brcm47xx/patches-2.6.35/601-mips-remove-pci-collision-check.patch18
1 files changed, 18 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.35/601-mips-remove-pci-collision-check.patch b/target/linux/brcm47xx/patches-2.6.35/601-mips-remove-pci-collision-check.patch
new file mode 100644
index 0000000000..7860ca0dd8
--- /dev/null
+++ b/target/linux/brcm47xx/patches-2.6.35/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)