From 4af6ac74fb0dd4b8f75c82543f3b3a17fbd75fcb Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Tue, 17 Jun 2008 12:57:04 +0000 Subject: upgrade to 2.6.25.7, and refresh patches SVN-Revision: 11523 --- .../patches-2.6.25/601-mips-remove-pci-collision-check.patch | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to '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 ed8938f287..21e89cddff 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,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; -- cgit v1.2.3