aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-2.6.31/601-mips-remove-pci-collision-check.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2009-09-26 11:48:48 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2009-09-26 11:48:48 +0000
commit8673372e20aa8ef53946ae606e1746f6abc39b1a (patch)
treef637b6541d53e029025d5cc87eb296724891a39c /target/linux/brcm47xx/patches-2.6.31/601-mips-remove-pci-collision-check.patch
parent6247141e7835a4bbf5850c9e94ae8c9a61eb20cf (diff)
downloadupstream-8673372e20aa8ef53946ae606e1746f6abc39b1a.tar.gz
upstream-8673372e20aa8ef53946ae606e1746f6abc39b1a.tar.bz2
upstream-8673372e20aa8ef53946ae606e1746f6abc39b1a.zip
add patches for kernel 2.6.31
This is completly untested. Only a compile tests with the default config was done! SVN-Revision: 17734
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.31/601-mips-remove-pci-collision-check.patch')
-rw-r--r--target/linux/brcm47xx/patches-2.6.31/601-mips-remove-pci-collision-check.patch18
1 files changed, 18 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.31/601-mips-remove-pci-collision-check.patch b/target/linux/brcm47xx/patches-2.6.31/601-mips-remove-pci-collision-check.patch
new file mode 100644
index 0000000000..7860ca0dd8
--- /dev/null
+++ b/target/linux/brcm47xx/patches-2.6.31/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)