[kernel] update to 2.6.25.19, and refresh patches

[openwrt.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 aa3ac25..9071b7c 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,10 +2,8 @@ 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.1/arch/mips/pci/pci.c
-===================================================================
---- linux-2.6.25.1.orig/arch/mips/pci/pci.c    2008-05-08 22:37:55.000000000 +0100
-+++ linux-2.6.25.1/arch/mips/pci/pci.c 2008-05-09 07:39:55.000000000 +0100
+--- 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)))