1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-18 14:40:17 +02:00
openwrt-xburst/target/linux/brcm47xx/patches-2.6.34/601-mips-remove-pci-collision-check.patch
acoul 7d1583626f brcm47xx: add preliminary 2.6.34 support
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20888 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-04-15 20:50:50 +00:00

19 lines
611 B
Diff

--- 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)