aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/ia64/pci/pci.c5
-rw-r--r--arch/x86/pci/acpi.c5
-rw-r--r--drivers/acpi/pci_root.c2
-rw-r--r--include/acpi/acpi_drivers.h3
4 files changed, 10 insertions, 5 deletions
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c
index 64aff520b899..aa2533ae7e9e 100644
--- a/arch/ia64/pci/pci.c
+++ b/arch/ia64/pci/pci.c
@@ -335,8 +335,11 @@ pcibios_setup_root_windows(struct pci_bus *bus, struct pci_controller *ctrl)
335} 335}
336 336
337struct pci_bus * __devinit 337struct pci_bus * __devinit
338pci_acpi_scan_root(struct acpi_device *device, int domain, int bus) 338pci_acpi_scan_root(struct acpi_pci_root *root)
339{ 339{
340 struct acpi_device *device = root->device;
341 int domain = root->segment;
342 int bus = root->secondary.start;
340 struct pci_controller *controller; 343 struct pci_controller *controller;
341 unsigned int windows = 0; 344 unsigned int windows = 0;
342 struct pci_bus *pbus; 345 struct pci_bus *pbus;
diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c
index e31160216efb..0b7882dbe784 100644
--- a/arch/x86/pci/acpi.c
+++ b/arch/x86/pci/acpi.c
@@ -229,8 +229,11 @@ res_alloc_fail:
229 return; 229 return;
230} 230}
231 231
232struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_device *device, int domain, int busnum) 232struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_pci_root *root)
233{ 233{
234 struct acpi_device *device = root->device;
235 int domain = root->segment;
236 int busnum = root->secondary.start;
234 struct pci_bus *bus; 237 struct pci_bus *bus;
235 struct pci_sysdata *sd; 238 struct pci_sysdata *sd;
236 int node; 239 int node;
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index bf476fea97ab..680450c905b3 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -498,7 +498,7 @@ static int __devinit acpi_pci_root_add(struct acpi_device *device)
498 * PCI namespace does not get created until this call is made (and 498 * PCI namespace does not get created until this call is made (and
499 * thus the root bridge's pci_dev does not exist). 499 * thus the root bridge's pci_dev does not exist).
500 */ 500 */
501 root->bus = pci_acpi_scan_root(device, segment, root->secondary.start); 501 root->bus = pci_acpi_scan_root(root);
502 if (!root->bus) { 502 if (!root->bus) {
503 printk(KERN_ERR PREFIX 503 printk(KERN_ERR PREFIX
504 "Bus %04x:%02x not present in PCI namespace\n", 504 "Bus %04x:%02x not present in PCI namespace\n",
diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h
index 4f7b44866b76..23d78b4d088b 100644
--- a/include/acpi/acpi_drivers.h
+++ b/include/acpi/acpi_drivers.h
@@ -104,8 +104,7 @@ int acpi_pci_bind_root(struct acpi_device *device);
104 104
105/* Arch-defined function to add a bus to the system */ 105/* Arch-defined function to add a bus to the system */
106 106
107struct pci_bus *pci_acpi_scan_root(struct acpi_device *device, int domain, 107struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root);
108 int bus);
109void pci_acpi_crs_quirks(void); 108void pci_acpi_crs_quirks(void);
110 109
111/* -------------------------------------------------------------------------- 110/* --------------------------------------------------------------------------