diff options
| author | Rafael J. Wysocki | 2014-03-17 13:48:18 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki | 2014-03-17 13:48:18 +0100 |
| commit | 2eb060975df2aaca635801dcfb99eaa45ede98fe (patch) | |
| tree | 0e8c5a409227b6d56665d1a149ea90985ab54ea2 /include/acpi/acpi_bus.h | |
| parent | Merge branch 'acpi-config' (diff) | |
| parent | ACPI: Drop acpi_evaluate_hotplug_ost() and ACPI_HOTPLUG_OST (diff) | |
| download | kernel-qcow2-linux-2eb060975df2aaca635801dcfb99eaa45ede98fe.tar.gz kernel-qcow2-linux-2eb060975df2aaca635801dcfb99eaa45ede98fe.tar.xz kernel-qcow2-linux-2eb060975df2aaca635801dcfb99eaa45ede98fe.zip | |
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/acpi_bus.h')
| -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, struct acpi_object_list *arguments, struct acpi_handle_list *list); acpi_status -acpi_evaluate_hotplug_ost(acpi_handle handle, u32 source_event, - u32 status_code, struct acpi_buffer *status_buf); +acpi_evaluate_ost(acpi_handle handle, u32 source_event, u32 status_code, + struct acpi_buffer *status_buf); acpi_status acpi_get_physical_device_location(acpi_handle handle, struct acpi_pld_info **pld); |