aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-2.6.28/601-mips-remove-pci-collision-check.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2009-01-06 22:36:41 +0000
committerFelix Fietkau <nbd@openwrt.org>2009-01-06 22:36:41 +0000
commitc2b878a3841b7ec8d1fad24d95b7c787b7e9f256 (patch)
tree35b4639cca9b18bae932100c7adf5a861fb250b6 /target/linux/brcm47xx/patches-2.6.28/601-mips-remove-pci-collision-check.patch
parent74429f096180d752b2dcc7916fea2ed85ea22c7f (diff)
downloadupstream-c2b878a3841b7ec8d1fad24d95b7c787b7e9f256.tar.gz
upstream-c2b878a3841b7ec8d1fad24d95b7c787b7e9f256.tar.bz2
upstream-c2b878a3841b7ec8d1fad24d95b7c787b7e9f256.zip
add initial 2.6.28 support for brcm47xx target
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 13909
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.patch19
1 files changed, 19 insertions, 0 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
new file mode 100644
index 0000000000..50b6fbdfe3
--- /dev/null
+++ b/target/linux/brcm47xx/patches-2.6.28/601-mips-remove-pci-collision-check.patch
@@ -0,0 +1,19 @@
+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)
+ if ((idx == PCI_ROM_RESOURCE) &&
+ (!(r->flags & IORESOURCE_ROM_ENABLE)))
+ continue;
+- if (!r->start && r->end) {
+- printk(KERN_ERR "PCI: Device %s not available "
+- "because of resource collisions\n",
++ if (!r->start && r->end)
++ printk(KERN_WARNING "PCI: Device %s resource"
++ "collisions detected. Ignoring...\n",
+ pci_name(dev));
+- return -EINVAL;
+- }
+ if (r->flags & IORESOURCE_IO)
+ cmd |= PCI_COMMAND_IO;
+ if (r->flags & IORESOURCE_MEM)