diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-06-25 22:46:47 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-06-25 22:46:47 +0200 |
| commit | 96c9ddae034a301bbd32c52da5c972778d73ad2e (patch) | |
| tree | 25ca63815efbe874ec2140efd7b6ad034afea387 /include/acpi/acpi_drivers.h | |
| parent | 9e895ace5d82df8929b16f58e9f515f6d54ab82d (diff) | |
| parent | 44521527be36172864e6e7a6fba4b66e9aa48e40 (diff) | |
Merge branch 'acpi-fixes'
* acpi-fixes:
libata-acpi: add back ACPI based hotplug functionality
ACPI / dock / PCI: Synchronous handling of dock events for PCI devices
PCI / ACPI: Use boot-time resource allocation rules during hotplug
ACPI / dock: Initialize ACPI dock subsystem upfront
Diffstat (limited to 'include/acpi/acpi_drivers.h')
| -rw-r--r-- | include/acpi/acpi_drivers.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h index e6168a24b9f..b420939f5eb 100644 --- a/include/acpi/acpi_drivers.h +++ b/include/acpi/acpi_drivers.h @@ -123,7 +123,9 @@ extern int register_dock_notifier(struct notifier_block *nb); extern void unregister_dock_notifier(struct notifier_block *nb); extern int register_hotplug_dock_device(acpi_handle handle, const struct acpi_dock_ops *ops, - void *context); + void *context, + void (*init)(void *), + void (*release)(void *)); extern void unregister_hotplug_dock_device(acpi_handle handle); #else static inline int is_dock_device(acpi_handle handle) @@ -139,7 +141,9 @@ static inline void unregister_dock_notifier(struct notifier_block *nb) } static inline int register_hotplug_dock_device(acpi_handle handle, const struct acpi_dock_ops *ops, - void *context) + void *context, + void (*init)(void *), + void (*release)(void *)) { return -ENODEV; } |