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-08-14 18:05:37 +0000
committerGabor Juhos <juhosg@openwrt.org>2008-08-14 18:05:37 +0000
commit0f18ecf43ef6c42d4be8253cd09f381ccfcb154d (patch)
tree0d03427f991068b8bb8cecac4b569ba8c3bb0197 /target/linux/brcm47xx/patches-2.6.23/601-mips-remove-pci-collision-check.patch
parent9379dc19b6b850617763d10cf545a5533c8e6f17 (diff)
downloadupstream-0f18ecf43ef6c42d4be8253cd09f381ccfcb154d.tar.gz
upstream-0f18ecf43ef6c42d4be8253cd09f381ccfcb154d.tar.bz2
upstream-0f18ecf43ef6c42d4be8253cd09f381ccfcb154d.zip
refresh 2.6.23 patches
SVN-Revision: 12311
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.patch8
1 files changed, 3 insertions, 5 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 7a7fb4e80c..5597ed5529 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,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.23.17/arch/mips/pci/pci.c
-===================================================================
---- 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
+--- a/arch/mips/pci/pci.c
++++ b/arch/mips/pci/pci.c
+@@ -177,10 +177,8 @@
continue;
r = &dev->resource[idx];