aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-2.6.23/601-mips-remove-pci-collision-check.patch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2008-05-19 08:08:23 +0000
committerGabor Juhos <juhosg@openwrt.org>2008-05-19 08:08:23 +0000
commit18c2ac7fd73cb71300d6de0abc044a88296f196e (patch)
treebba15878199743d9aa9123f57b47a2e4a7e2f672 /target/linux/brcm47xx/patches-2.6.23/601-mips-remove-pci-collision-check.patch
parent7fcae2b69aebe6554c5a85167bea441116fc9daa (diff)
downloadupstream-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.23/601-mips-remove-pci-collision-check.patch')
-rw-r--r--target/linux/brcm47xx/patches-2.6.23/601-mips-remove-pci-collision-check.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.23/601-mips-remove-pci-collision-check.patch b/target/linux/brcm47xx/patches-2.6.23/601-mips-remove-pci-collision-check.patch
index 8ab28a75e2..7a7fb4e80c 100644
--- a/target/linux/brcm47xx/patches-2.6.23/601-mips-remove-pci-collision-check.patch
+++ b/target/linux/brcm47xx/patches-2.6.23/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.23.16/arch/mips/pci/pci.c
+Index: linux-2.6.23.17/arch/mips/pci/pci.c
===================================================================
---- linux-2.6.23.16.orig/arch/mips/pci/pci.c 2008-02-16 17:55:20.000000000 +0100
-+++ linux-2.6.23.16/arch/mips/pci/pci.c 2008-02-16 17:57:39.000000000 +0100
+--- linux-2.6.23.17.orig/arch/mips/pci/pci.c
++++ linux-2.6.23.17/arch/mips/pci/pci.c
@@ -177,10 +177,8 @@ static int pcibios_enable_resources(stru
continue;