aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/pci/common.c7
-rw-r--r--drivers/pci/probe.c6
2 files changed, 6 insertions, 7 deletions
diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c
index 8c362b96b644..f80ece51305d 100644
--- a/arch/x86/pci/common.c
+++ b/arch/x86/pci/common.c
@@ -142,15 +142,20 @@ static void __devinit pcibios_fixup_device_resources(struct pci_dev *dev)
142 } 142 }
143} 143}
144 144
145void __attribute__((weak)) set_pci_bus_resources_arch_default(struct pci_bus *b)
146{
147}
148
145/* 149/*
146 * Called after each bus is probed, but before its children 150 * Called after each bus is probed, but before its children
147 * are examined. 151 * are examined.
148 */ 152 */
149 153
150void __devinit pcibios_fixup_bus(struct pci_bus *b) 154void __devinit pcibios_fixup_bus(struct pci_bus *b)
151{ 155{
152 struct pci_dev *dev; 156 struct pci_dev *dev;
153 157
158 set_pci_bus_resources_arch_default(b);
154 pci_read_bridge_bases(b); 159 pci_read_bridge_bases(b);
155 list_for_each_entry(dev, &b->devices, bus_list) 160 list_for_each_entry(dev, &b->devices, bus_list)
156 pcibios_fixup_device_resources(dev); 161 pcibios_fixup_device_resources(dev);
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
1121void __attribute__((weak)) set_pci_bus_resources_arch_default(struct pci_bus *b)
1122{
1123}
1124
1125struct pci_bus * pci_create_bus(struct device *parent, 1121struct 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
1187dev_create_file_err: 1181dev_create_file_err: