[kernel] upgrade to 2.6.25.7, and refresh patches

[openwrt/svn-archive/archive.git] / 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 ed8938f28726211a3e5340f65b183ec1dee788d5..21e89cddfffa9826fadb149a86561a4b699cbeb9 100644 (file)
--- 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,11 +2,9 @@ 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
+--- a/arch/mips/pci/pci.c
++++ b/arch/mips/pci/pci.c
+@@ -182,12 +182,10 @@
                if ((idx == PCI_ROM_RESOURCE) &&
                                (!(r->flags & IORESOURCE_ROM_ENABLE)))
                        continue;