diff options
author | Matthew Wilcox <matthew@wil.cx> | 2009-04-16 15:31:10 -0400 |
---|---|---|
committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-04-22 16:57:36 -0400 |
commit | 0bb1be3e30bfc3e09fa0ff1e887ac7da4a16c3a2 (patch) | |
tree | 997b7e0dd0579c3aed6337c9ae24106ccab163b7 /drivers/pci/probe.c | |
parent | 044cd80942e47b9de0915b627902adf05c52377f (diff) |
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.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 8eb50dffb78a..e3c3e081b834 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) | |||
1118 | return max; | 1118 | return max; |
1119 | } | 1119 | } |
1120 | 1120 | ||
1121 | void __attribute__((weak)) set_pci_bus_resources_arch_default(struct pci_bus *b) | ||
1122 | { | ||
1123 | } | ||
1124 | |||
1125 | struct pci_bus * pci_create_bus(struct device *parent, | 1121 | struct pci_bus * pci_create_bus(struct device *parent, |
1126 | int bus, struct pci_ops *ops, void *sysdata) | 1122 | int bus, struct pci_ops *ops, void *sysdata) |
1127 | { | 1123 | { |
@@ -1180,8 +1176,6 @@ struct pci_bus * pci_create_bus(struct device *parent, | |||
1180 | b->resource[0] = &ioport_resource; | 1176 | b->resource[0] = &ioport_resource; |
1181 | b->resource[1] = &iomem_resource; | 1177 | b->resource[1] = &iomem_resource; |
1182 | 1178 | ||
1183 | set_pci_bus_resources_arch_default(b); | ||
1184 | |||
1185 | return b; | 1179 | return b; |
1186 | 1180 | ||
1187 | dev_create_file_err: | 1181 | dev_create_file_err: |