diff options
| author | Len Brown <len.brown@intel.com> | 2008-10-23 07:25:26 +0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-10-23 07:25:26 +0400 |
| commit | 47bf31adc541bef0c20de15e800e0011f1ae70c7 (patch) | |
| tree | 28903879a8570eaefa57942ec3d475d365f5a465 /include/acpi/acpi_drivers.h | |
| parent | 4538fad56ee1c16bce0294b5647d2551f0e03164 (diff) | |
| parent | 0a918a9432cc30aede10f904253b66ea6ab485ac (diff) | |
| download | linux-47bf31adc541bef0c20de15e800e0011f1ae70c7.tar.xz | |
Merge branch 'dock' into test
Conflicts:
drivers/acpi/osl.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include/acpi/acpi_drivers.h')
| -rw-r--r-- | include/acpi/acpi_drivers.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h index efbaa271ee11..a35c9597d5b1 100644 --- a/include/acpi/acpi_drivers.h +++ b/include/acpi/acpi_drivers.h @@ -116,12 +116,17 @@ int acpi_processor_set_thermal_limit(acpi_handle handle, int type); /*-------------------------------------------------------------------------- Dock Station -------------------------------------------------------------------------- */ +struct acpi_dock_ops { + acpi_notify_handler handler; + acpi_notify_handler uevent; +}; + #if defined(CONFIG_ACPI_DOCK) || defined(CONFIG_ACPI_DOCK_MODULE) extern int is_dock_device(acpi_handle handle); 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, - acpi_notify_handler handler, + struct acpi_dock_ops *ops, void *context); extern void unregister_hotplug_dock_device(acpi_handle handle); #else @@ -137,7 +142,7 @@ static inline void unregister_dock_notifier(struct notifier_block *nb) { } static inline int register_hotplug_dock_device(acpi_handle handle, - acpi_notify_handler handler, + struct acpi_dock_ops *ops, void *context) { return -ENODEV; |