Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
  PCI: remove unused resource assignment in pci_read_bridge_bases()
  PCI hotplug: shpchp: message refinement
  PCI hotplug: shpchp: replace printk with dev_printk
  PCI: add routines for debugging and handling lost interrupts
  PCI hotplug: pciehp: message refinement
  PCI: fix ARI code to be compatible with mixed ARI/non-ARI systems
  PCI hotplug: cpqphp: fix kernel NULL pointer dereference

1 files changed, 0 insertions, 3 deletions

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 6f1e51d77bce..003a9b3c293f 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -298,9 +298,6 @@ void __devinit pci_read_bridge_bases(struct pci_bus *child)
                         child->resource[i] = child->parent->resource[i - 3];
         }
 
-        for(i=0; i<3; i++)
-                child->resource[i] = &dev->resource[PCI_BRIDGE_RESOURCES+i];
-
         res = child->resource[0];
         pci_read_config_byte(dev, PCI_IO_BASE, &io_base_lo);
         pci_read_config_byte(dev, PCI_IO_LIMIT, &io_limit_lo);