1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-01 04:06:16 +02:00
openwrt-xburst/target/linux/brcm47xx/patches-2.6.25/601-mips-remove-pci-collision-check.patch
juhosg 17bba1a8f6 [brcm47xx] refresh kernel patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11200 3c298f89-4303-0410-b956-a3cf2f4a3e73
2008-05-19 08:08:23 +00:00

25 lines
963 B
Diff

The SSB pcicore driver does create some MMIO resource collisions.
However, the pcicore PCI-fixup routine fixes these collisions afterwards.
Remove this sanity check for now until we find a better solution.
--mb
Index: linux-2.6.25.4/arch/mips/pci/pci.c
===================================================================
--- linux-2.6.25.4.orig/arch/mips/pci/pci.c
+++ linux-2.6.25.4/arch/mips/pci/pci.c
@@ -182,12 +182,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)