diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-23 19:31:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-23 19:31:34 -0700 |
| commit | 3a2c5dad6c4d4551effba477f4f45fa5feb1293f (patch) | |
| tree | 1e1f1ab67279c46c3e6aed1c4041880f58ec5dae /drivers/pci/probe.c | |
| parent | 2242d5eff17cf91110a3c44747f9f2e1a938cbda (diff) | |
| parent | a491913ff22c2b69d937d14296db6fa34dbff068 (diff) | |
| download | op-kernel-dev-3a2c5dad6c4d4551effba477f4f45fa5feb1293f.zip op-kernel-dev-3a2c5dad6c4d4551effba477f4f45fa5feb1293f.tar.gz | |
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
Diffstat (limited to 'drivers/pci/probe.c')
| -rw-r--r-- | drivers/pci/probe.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 6f1e51d..003a9b3 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); |
