diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2023-10-26 15:04:49 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2023-10-26 15:04:49 +0200 |
| commit | 3660e641ef68dc2503e3c3120814e80359e0e66b (patch) | |
| tree | 58e006c797f83d5d2a5d3b57a772104a9a8c0365 /include/acpi | |
| parent | e8c3c7f97aa79c93713aecba5bdf83273076cf5d (diff) | |
| parent | 470508f63ad2483b1ae82ed67cd504ad408b2a35 (diff) | |
| download | linux-3660e641ef68dc2503e3c3120814e80359e0e66b.tar.gz | |
Merge branch 'acpi-bus'
Merge ACPI bus type driver updates for 6.7-rc1:
- Add context argument to acpi_dev_install_notify_handler() (Rafael
Wysocki).
- Clarify ACPI bus concepts in the ACPI device enumeration
documentation (Rafael Wysocki).
* acpi-bus:
ACPI: bus: Add context argument to acpi_dev_install_notify_handler()
ACPI: docs: enumeration: Clarify ACPI bus concepts
Diffstat (limited to 'include/acpi')
| -rw-r--r-- | include/acpi/acpi_bus.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index 20c637687086d..afeed6e72049e 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h @@ -520,7 +520,7 @@ int acpi_bus_attach_private_data(acpi_handle, void *); void acpi_bus_detach_private_data(acpi_handle); int acpi_dev_install_notify_handler(struct acpi_device *adev, u32 handler_type, - acpi_notify_handler handler); + acpi_notify_handler handler, void *context); void acpi_dev_remove_notify_handler(struct acpi_device *adev, u32 handler_type, acpi_notify_handler handler); |