diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-03-17 08:48:18 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-03-17 08:48:18 -0400 |
commit | 2eb060975df2aaca635801dcfb99eaa45ede98fe (patch) | |
tree | 0e8c5a409227b6d56665d1a149ea90985ab54ea2 /include/acpi | |
parent | 75c44eddcb4989b85826143bc09fd3ad120abd4e (diff) | |
parent | 700b8422fb9e6041907bda45a15f4e2ab0438a04 (diff) |
Merge branch 'acpi-ost'
* acpi-ost:
ACPI: Drop acpi_evaluate_hotplug_ost() and ACPI_HOTPLUG_OST
ACPI: use device name LNXSYBUS.xx for ACPI \_SB and \_TZ objects
ACPI / processor: use acpi_evaluate_ost() to replace open-coded version
ACPI / PAD / xen: use acpi_evaluate_ost() to replace open-coded version
ACPI / PAD: use acpi_evaluate_ost() to replace open-coded version
ACPI: rename acpi_evaluate_hotplug_ost() to acpi_evaluate_ost()
Diffstat (limited to 'include/acpi')
-rw-r--r-- | include/acpi/acpi_bus.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index 660f5056a37f..ca4ac463cc7a 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h | |||
@@ -49,8 +49,8 @@ acpi_evaluate_reference(acpi_handle handle, | |||
49 | struct acpi_object_list *arguments, | 49 | struct acpi_object_list *arguments, |
50 | struct acpi_handle_list *list); | 50 | struct acpi_handle_list *list); |
51 | acpi_status | 51 | acpi_status |
52 | acpi_evaluate_hotplug_ost(acpi_handle handle, u32 source_event, | 52 | acpi_evaluate_ost(acpi_handle handle, u32 source_event, u32 status_code, |
53 | u32 status_code, struct acpi_buffer *status_buf); | 53 | struct acpi_buffer *status_buf); |
54 | 54 | ||
55 | acpi_status | 55 | acpi_status |
56 | acpi_get_physical_device_location(acpi_handle handle, struct acpi_pld_info **pld); | 56 | acpi_get_physical_device_location(acpi_handle handle, struct acpi_pld_info **pld); |