lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Len Brown
2010-05-28 16:17:16 -04:00
parent 6e320ec1d9 57283776b2
commit dc1544ea5d
5 changed files with 50 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arch/x86/pci/acpi.c
View File

@@ -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;