diff options
author | Imre Kaloz <kaloz@openwrt.org> | 2009-12-27 21:28:02 +0000 |
---|---|---|
committer | Imre Kaloz <kaloz@openwrt.org> | 2009-12-27 21:28:02 +0000 |
commit | 2434746dd4bc0c8c00d5a94e44f05604e2dca304 (patch) | |
tree | 180b2c74131eb4d4bd7c855e1de0ca28bda8127c /target/linux/brcm47xx/patches-2.6.28/601-mips-remove-pci-collision-check.patch | |
parent | 4060780e57e972944be3a83db84bc37948949698 (diff) | |
download | upstream-2434746dd4bc0c8c00d5a94e44f05604e2dca304.tar.gz upstream-2434746dd4bc0c8c00d5a94e44f05604e2dca304.tar.bz2 upstream-2434746dd4bc0c8c00d5a94e44f05604e2dca304.zip |
switch ixp4xx and ubicom32 to 2.6.30, get rid of 2.6.28 files
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18952 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.patch | 18 |
1 files changed, 0 insertions, 18 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 deleted file mode 100644 index 8bc0090858..0000000000 --- a/target/linux/brcm47xx/patches-2.6.28/601-mips-remove-pci-collision-check.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/arch/mips/pci/pci.c -+++ b/arch/mips/pci/pci.c -@@ -207,12 +207,10 @@ static int pcibios_enable_resources(stru - 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) |