X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/320dc1ed4043cd83e7f4237464b332c928d18f0d..1d55b67ff96d3a1a9bb786ec78250134d4ab5c81:/target/linux/brcm47xx/patches-2.6.25/601-mips-remove-pci-collision-check.patch

diff --git a/target/linux/brcm47xx/patches-2.6.25/601-mips-remove-pci-collision-check.patch b/target/linux/brcm47xx/patches-2.6.25/601-mips-remove-pci-collision-check.patch
index 8ab28a75e..9071b7cb3 100644
--- a/target/linux/brcm47xx/patches-2.6.25/601-mips-remove-pci-collision-check.patch
+++ b/target/linux/brcm47xx/patches-2.6.25/601-mips-remove-pci-collision-check.patch
@@ -2,20 +2,21 @@ 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.23.16/arch/mips/pci/pci.c
-===================================================================
---- linux-2.6.23.16.orig/arch/mips/pci/pci.c	2008-02-16 17:55:20.000000000 +0100
-+++ linux-2.6.23.16/arch/mips/pci/pci.c	2008-02-16 17:57:39.000000000 +0100
-@@ -177,10 +177,8 @@ static int pcibios_enable_resources(stru
+--- a/arch/mips/pci/pci.c
++++ b/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;
- 
- 		r = &dev->resource[idx];
 -		if (!r->start && r->end) {
--			printk(KERN_ERR "PCI: Device %s not available because of resource collisions\n", pci_name(dev));
+-			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->start && r->end)
-+			printk(KERN_WARNING "PCI: Device %s resource collisions detected. Ignoring...\n", pci_name(dev));
  		if (r->flags & IORESOURCE_IO)
  			cmd |= PCI_COMMAND_IO;
  		if (r->flags & IORESOURCE_MEM)