summaryrefslogtreecommitdiffstats
path: root/drivers/pci/probe.c
diff options
context:
space:
mode:
authorMatthew Wilcox <matthew@wil.cx>2009-04-16 13:31:10 -0600
committerJesse Barnes <jbarnes@virtuousgeek.org>2009-04-22 13:57:36 -0700
commit0bb1be3e30bfc3e09fa0ff1e887ac7da4a16c3a2 (patch)
tree997b7e0dd0579c3aed6337c9ae24106ccab163b7 /drivers/pci/probe.c
parent044cd80942e47b9de0915b627902adf05c52377f (diff)
downloadop-kernel-dev-0bb1be3e30bfc3e09fa0ff1e887ac7da4a16c3a2.zip
op-kernel-dev-0bb1be3e30bfc3e09fa0ff1e887ac7da4a16c3a2.tar.gz
x86/PCI: Move set_pci_bus_resources_arch_default into arch/x86
Commit 30a18d6c3f1e774de656ebd8ff219d53e2ba4029 introduced a new function to set the PCI bus resources. Unfortunately, neither the author, nor the committers seemed to know that we already have somewhere to do that -- pcibios_fixup_bus(). This patch moves the hook (used only by the K8 code) into x86-specific code where it should have been in the first place. Cc: Yinghai Lu <yinghai.lu@sun.com> Signed-off-by: Matthew Wilcox <willy@linux.intel.com> Acked-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'drivers/pci/probe.c')
-rw-r--r--drivers/pci/probe.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 8eb50df..e3c3e08 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -1118,10 +1118,6 @@ unsigned int __devinit pci_scan_child_bus(struct pci_bus *bus)
return max;
}
-void __attribute__((weak)) set_pci_bus_resources_arch_default(struct pci_bus *b)
-{
-}
-
struct pci_bus * pci_create_bus(struct device *parent,
int bus, struct pci_ops *ops, void *sysdata)
{
@@ -1180,8 +1176,6 @@ struct pci_bus * pci_create_bus(struct device *parent,
b->resource[0] = &ioport_resource;
b->resource[1] = &iomem_resource;
- set_pci_bus_resources_arch_default(b);
-
return b;
dev_create_file_err:
OpenPOWER on IntegriCloud