summaryrefslogtreecommitdiffstats
path: root/include/acpi
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 /include/acpi
parent6e320ec1d98f9eb93d5b2a5d70e2f40dce923f1b (diff)
parent57283776b2b821ba4d592f61cad04d0293412740 (diff)
downloadop-kernel-dev-dc1544ea5d6dfdf29440295788e639e4b44c605a.zip
op-kernel-dev-dc1544ea5d6dfdf29440295788e639e4b44c605a.tar.gz
Merge branch 'bjorn-pci-root-v4-2.6.35' into release
Diffstat (limited to 'include/acpi')
-rw-r--r--include/acpi/acpi_bus.h2
-rw-r--r--include/acpi/acpi_drivers.h3
2 files changed, 2 insertions, 3 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index 7bf83dd..baacd98 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -373,7 +373,7 @@ struct acpi_pci_root {
struct acpi_pci_id id;
struct pci_bus *bus;
u16 segment;
- u8 bus_nr;
+ struct resource secondary; /* downstream bus range */
u32 osc_support_set; /* _OSC state of support bits */
u32 osc_control_set; /* _OSC state of control bits */
diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h
index 4f7b448..23d78b4 100644
--- a/include/acpi/acpi_drivers.h
+++ b/include/acpi/acpi_drivers.h
@@ -104,8 +104,7 @@ int acpi_pci_bind_root(struct acpi_device *device);
/* Arch-defined function to add a bus to the system */
-struct pci_bus *pci_acpi_scan_root(struct acpi_device *device, int domain,
- int bus);
+struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root);
void pci_acpi_crs_quirks(void);
/* --------------------------------------------------------------------------
OpenPOWER on IntegriCloud