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@hauke-m.de>2009-03-01 20:19:55 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2009-03-01 20:19:55 +0000
commit4c548fbacad57bdbf903c0060d1b28e329cf0690 (patch)
tree7c635acbbd1d8e206d19d73aa6190a7b4a7139e0 /target/linux/brcm47xx/patches-2.6.28/601-mips-remove-pci-collision-check.patch
parent1b922ab410fd1e1a0c2320ba097a79d09dfe9788 (diff)
downloadupstream-4c548fbacad57bdbf903c0060d1b28e329cf0690.tar.gz
upstream-4c548fbacad57bdbf903c0060d1b28e329cf0690.tar.bz2
upstream-4c548fbacad57bdbf903c0060d1b28e329cf0690.zip
refresh patches and configuration
SVN-Revision: 14722
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;