diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2008-06-17 12:57:04 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2008-06-17 12:57:04 +0000 |
| commit | 4af6ac74fb0dd4b8f75c82543f3b3a17fbd75fcb (patch) | |
| tree | 40cb3a459399cd0fc128e0f0cfcb82cab6409ed0 /target/linux/brcm47xx/patches-2.6.25/601-mips-remove-pci-collision-check.patch | |
| parent | 3415b8c04439a74b9311b2d5a4beb14a13341525 (diff) | |
| download | openwrt-4af6ac74fb0dd4b8f75c82543f3b3a17fbd75fcb.tar.gz openwrt-4af6ac74fb0dd4b8f75c82543f3b3a17fbd75fcb.tar.bz2 openwrt-4af6ac74fb0dd4b8f75c82543f3b3a17fbd75fcb.zip | |
upgrade to 2.6.25.7, and refresh patches
SVN-Revision: 11523
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.25/601-mips-remove-pci-collision-check.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-2.6.25/601-mips-remove-pci-collision-check.patch | 8 |
1 files changed, 3 insertions, 5 deletions
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; |