aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-2.6.28/601-mips-remove-pci-collision-check.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2009-03-01 20:19:55 +0000
committerHauke Mehrtens <hauke@openwrt.org>2009-03-01 20:19:55 +0000
commit6aa5e11d18daac765f223ded7627fdd510cf7979 (patch)
tree8a47c763f38fab533261e04d8a0c6dd08ef5ba7f /target/linux/brcm47xx/patches-2.6.28/601-mips-remove-pci-collision-check.patch
parent4a38dd6fd384648ee48c275c0765ea1d5c1c8684 (diff)
downloadupstream-6aa5e11d18daac765f223ded7627fdd510cf7979.tar.gz
upstream-6aa5e11d18daac765f223ded7627fdd510cf7979.tar.bz2
upstream-6aa5e11d18daac765f223ded7627fdd510cf7979.zip
[brcm47xx] refresh patches and configuration
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14722 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.28/601-mips-remove-pci-collision-check.patch')
-rw-r--r--target/linux/brcm47xx/patches-2.6.28/601-mips-remove-pci-collision-check.patch3
1 files changed, 1 insertions, 2 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.28/601-mips-remove-pci-collision-check.patch b/target/linux/brcm47xx/patches-2.6.28/601-mips-remove-pci-collision-check.patch
index 50b6fbdfe3..8bc0090858 100644
--- a/target/linux/brcm47xx/patches-2.6.28/601-mips-remove-pci-collision-check.patch
+++ b/target/linux/brcm47xx/patches-2.6.28/601-mips-remove-pci-collision-check.patch
@@ -1,7 +1,6 @@
-diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c
--- a/arch/mips/pci/pci.c
+++ b/arch/mips/pci/pci.c
-@@ -207,12 +207,10 @@ static int pcibios_enable_resources(struct pci_dev *dev, int mask)
+@@ -207,12 +207,10 @@ static int pcibios_enable_resources(stru
if ((idx == PCI_ROM_RESOURCE) &&
(!(r->flags & IORESOURCE_ROM_ENABLE)))
continue;