Merge branch 'bjorn-pci-root-v4-2.6.35' into release

2 files changed, 8 insertions, 2 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)
 }
 
 struct pci_bus * __devinit
-pci_acpi_scan_root(struct acpi_device *device, int domain, int bus)
+pci_acpi_scan_root(struct acpi_pci_root *root)
 {
+        struct acpi_device *device = root->device;
+        int domain = root->segment;
+        int bus = root->secondary.start;
         struct pci_controller *controller;
         unsigned int windows = 0;
         struct pci_bus *pbus;
diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c
index 31930fd30ea9..9dcf43d7d0c0 100644
--- a/arch/x86/pci/acpi.c
+++ b/arch/x86/pci/acpi.c
@@ -224,8 +224,11 @@ res_alloc_fail:
         return;
 }
 
-struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_device *device, int domain, int busnum)
+struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_pci_root *root)
 {
+        struct acpi_device *device = root->device;
+        int domain = root->segment;
+        int busnum = root->secondary.start;
         struct pci_bus *bus;
         struct pci_sysdata *sd;
         int node;