diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-28 12:27:20 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-28 12:27:23 +1000 |
| commit | a6af6d798947eadddb157e0d29f3d84a096a1c9a (patch) | |
| tree | d375ee6db9dac0a56d93e58f1ce053b15d61db05 /arch/x86/pci/acpi.c | |
| parent | 43eb91541bf50f0a1c173f53b8c09f854005321e (diff) | |
| parent | 38f34b463c487cebaae4a8949a87e53be41937bf (diff) | |
Merge remote branch 'acpi/test'
Diffstat (limited to 'arch/x86/pci/acpi.c')
| -rw-r--r-- | arch/x86/pci/acpi.c | 5 |
1 files changed, 4 insertions, 1 deletions
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; |