summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2010-05-28 16:17:16 -0400
committerLen Brown <len.brown@intel.com>2010-05-28 16:17:16 -0400
commitdc1544ea5d6dfdf29440295788e639e4b44c605a (patch)
treefd4a26e78c32a43a7eb59860774f7f960f91a60c /arch
parent6e320ec1d98f9eb93d5b2a5d70e2f40dce923f1b (diff)
parent57283776b2b821ba4d592f61cad04d0293412740 (diff)
downloadlinux-3.10-dc1544ea5d6dfdf29440295788e639e4b44c605a.tar.gz
linux-3.10-dc1544ea5d6dfdf29440295788e639e4b44c605a.tar.bz2
linux-3.10-dc1544ea5d6dfdf29440295788e639e4b44c605a.zip
Merge branch 'bjorn-pci-root-v4-2.6.35' into release
Diffstat (limited to 'arch')
-rw-r--r--arch/ia64/pci/pci.c5
-rw-r--r--arch/x86/pci/acpi.c5
2 files changed, 8 insertions, 2 deletions
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c
index 64aff520b89..aa2533ae7e9 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 31930fd30ea..9dcf43d7d0c 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;