diff options
author | Len Brown <len.brown@intel.com> | 2010-05-28 16:17:16 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2010-05-28 16:17:16 -0400 |
commit | dc1544ea5d6dfdf29440295788e639e4b44c605a (patch) | |
tree | fd4a26e78c32a43a7eb59860774f7f960f91a60c /arch/x86 | |
parent | 6e320ec1d98f9eb93d5b2a5d70e2f40dce923f1b (diff) | |
parent | 57283776b2b821ba4d592f61cad04d0293412740 (diff) |
Merge branch 'bjorn-pci-root-v4-2.6.35' into release
Diffstat (limited to 'arch/x86')
-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: | |||
224 | return; | 224 | return; |
225 | } | 225 | } |
226 | 226 | ||
227 | struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_device *device, int domain, int busnum) | 227 | struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_pci_root *root) |
228 | { | 228 | { |
229 | struct acpi_device *device = root->device; | ||
230 | int domain = root->segment; | ||
231 | int busnum = root->secondary.start; | ||
229 | struct pci_bus *bus; | 232 | struct pci_bus *bus; |
230 | struct pci_sysdata *sd; | 233 | struct pci_sysdata *sd; |
231 | int node; | 234 | int node; |