diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/ia64/pci/pci.c | 5 | ||||
-rw-r--r-- | arch/x86/pci/acpi.c | 5 |
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) | |||
335 | } | 335 | } |
336 | 336 | ||
337 | struct pci_bus * __devinit | 337 | struct pci_bus * __devinit |
338 | pci_acpi_scan_root(struct acpi_device *device, int domain, int bus) | 338 | pci_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 | ||
232 | struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_device *device, int domain, int busnum) | 232 | struct 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; |