Commit e7812034 authored by Linus Torvalds's avatar Linus Torvalds

Revert bad PCI bridge resource handling from -dj tree

Cset exclude: davej@codemonkey.org.uk|ChangeSet|20021126023731|33210
parent e4cc7031
...@@ -107,14 +107,6 @@ pci_setup_bridge(struct pci_bus *bus) ...@@ -107,14 +107,6 @@ pci_setup_bridge(struct pci_bus *bus)
DBGC((KERN_INFO "PCI: Bus %d, bridge: %s\n", DBGC((KERN_INFO "PCI: Bus %d, bridge: %s\n",
bus->number, bridge->dev.name)); bus->number, bridge->dev.name));
/* Add bridge resources to the resource tree. */
if (bus->resource[0]->end > bus->resource[0]->start &&
request_resource(bus->resource[0], bus->resource[0]) < 0)
printk(KERN_ERR "PCI: failed to reserve IO for bus %d\n", bus->number);
if (bus->resource[1]->end > bus->resource[1]->start &&
request_resource(bus->resource[1], bus->resource[1]) < 0)
printk(KERN_ERR "PCI: failed to reserve MEM for bus %d\n", bus->number);
/* Set up the top and bottom of the PCI I/O segment for this bus. */ /* Set up the top and bottom of the PCI I/O segment for this bus. */
if (bus->resource[0]->flags & IORESOURCE_IO) { if (bus->resource[0]->flags & IORESOURCE_IO) {
pci_read_config_dword(bridge, PCI_IO_BASE, &l); pci_read_config_dword(bridge, PCI_IO_BASE, &l);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment