diff options
| author | Peter Denison <openwrt@marshadder.org> | 2008-05-16 19:25:20 +0000 |
|---|---|---|
| committer | Peter Denison <openwrt@marshadder.org> | 2008-05-16 19:25:20 +0000 |
| commit | 79aed699d71b9f583762a4b184bb7a68521dccb9 (patch) | |
| tree | 74aaab10bc8d14ea76857a0ea17fc31419d255e9 /target/linux/brcm47xx/patches-2.6.25/601-mips-remove-pci-collision-check.patch | |
| parent | 9788ab458ceb294131f6145eba79dfd01e380ffc (diff) | |
| download | upstream-79aed699d71b9f583762a4b184bb7a68521dccb9.tar.gz upstream-79aed699d71b9f583762a4b184bb7a68521dccb9.tar.bz2 upstream-79aed699d71b9f583762a4b184bb7a68521dccb9.zip | |
Remove files now present upstream in files-2.6.25 (This is mostly just drivers/ssb and include/linux/ssb) [brcm47xx] Regenerate patches against 2.6.25.1 kernel+files set Default is still to build against 2.6.23.16
SVN-Revision: 11155
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.25/601-mips-remove-pci-collision-check.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-2.6.25/601-mips-remove-pci-collision-check.patch | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.25/601-mips-remove-pci-collision-check.patch b/target/linux/brcm47xx/patches-2.6.25/601-mips-remove-pci-collision-check.patch index 8ab28a75e2..aa3ac25168 100644 --- a/target/linux/brcm47xx/patches-2.6.25/601-mips-remove-pci-collision-check.patch +++ b/target/linux/brcm47xx/patches-2.6.25/601-mips-remove-pci-collision-check.patch @@ -2,20 +2,23 @@ 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.16/arch/mips/pci/pci.c +Index: linux-2.6.25.1/arch/mips/pci/pci.c =================================================================== ---- linux-2.6.23.16.orig/arch/mips/pci/pci.c 2008-02-16 17:55:20.000000000 +0100 -+++ linux-2.6.23.16/arch/mips/pci/pci.c 2008-02-16 17:57:39.000000000 +0100 -@@ -177,10 +177,8 @@ static int pcibios_enable_resources(stru +--- linux-2.6.25.1.orig/arch/mips/pci/pci.c 2008-05-08 22:37:55.000000000 +0100 ++++ linux-2.6.25.1/arch/mips/pci/pci.c 2008-05-09 07:39:55.000000000 +0100 +@@ -182,12 +182,10 @@ static int pcibios_enable_resources(stru + if ((idx == PCI_ROM_RESOURCE) && + (!(r->flags & IORESOURCE_ROM_ENABLE))) continue; - - r = &dev->resource[idx]; - if (!r->start && r->end) { -- printk(KERN_ERR "PCI: Device %s not available because of resource collisions\n", pci_name(dev)); +- 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->start && r->end) -+ printk(KERN_WARNING "PCI: Device %s resource collisions detected. Ignoring...\n", pci_name(dev)); if (r->flags & IORESOURCE_IO) cmd |= PCI_COMMAND_IO; if (r->flags & IORESOURCE_MEM) |