diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2008-05-19 08:08:23 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2008-05-19 08:08:23 +0000 |
| commit | 18c2ac7fd73cb71300d6de0abc044a88296f196e (patch) | |
| tree | bba15878199743d9aa9123f57b47a2e4a7e2f672 /target/linux/brcm47xx/patches-2.6.25/601-mips-remove-pci-collision-check.patch | |
| parent | 7fcae2b69aebe6554c5a85167bea441116fc9daa (diff) | |
| download | upstream-18c2ac7fd73cb71300d6de0abc044a88296f196e.tar.gz upstream-18c2ac7fd73cb71300d6de0abc044a88296f196e.tar.bz2 upstream-18c2ac7fd73cb71300d6de0abc044a88296f196e.zip | |
[brcm47xx] refresh kernel patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11200 3c298f89-4303-0410-b956-a3cf2f4a3e73
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 | 6 |
1 files changed, 3 insertions, 3 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 aa3ac25168..ed8938f287 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,10 +2,10 @@ 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 +Index: linux-2.6.25.4/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 +--- 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 if ((idx == PCI_ROM_RESOURCE) && (!(r->flags & IORESOURCE_ROM_ENABLE))) |