summaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-2.6.23/601-mips-remove-pci-collision-check.patch
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-08-14 18:05:37 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-08-14 18:05:37 +0000
commit284a2e1864738811eac5096c1a20a268c33d6afa (patch)
treedb5a82fd1f2a213e0ee8d7bbd15579b183c6ff78 /target/linux/brcm47xx/patches-2.6.23/601-mips-remove-pci-collision-check.patch
parent18842f8755afe29b5c0a8eee3a416099c1a3ef88 (diff)
[brcm47xx] refresh 2.6.23 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12311 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.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 7a7fb4e80..5597ed552 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];