diff options
Diffstat (limited to 'include/acpi/acpi_drivers.h')
-rw-r--r-- | include/acpi/acpi_drivers.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h index e5f38e5ce86f..cf04c6011c2a 100644 --- a/include/acpi/acpi_drivers.h +++ b/include/acpi/acpi_drivers.h | |||
@@ -93,6 +93,7 @@ int acpi_enable_wakeup_device_power(struct acpi_device *dev, int sleep_state); | |||
93 | int acpi_disable_wakeup_device_power(struct acpi_device *dev); | 93 | int acpi_disable_wakeup_device_power(struct acpi_device *dev); |
94 | int acpi_power_get_inferred_state(struct acpi_device *device); | 94 | int acpi_power_get_inferred_state(struct acpi_device *device); |
95 | int acpi_power_transition(struct acpi_device *device, int state); | 95 | int acpi_power_transition(struct acpi_device *device, int state); |
96 | extern int acpi_power_nocheck; | ||
96 | #endif | 97 | #endif |
97 | 98 | ||
98 | /* -------------------------------------------------------------------------- | 99 | /* -------------------------------------------------------------------------- |
@@ -100,6 +101,7 @@ int acpi_power_transition(struct acpi_device *device, int state); | |||
100 | -------------------------------------------------------------------------- */ | 101 | -------------------------------------------------------------------------- */ |
101 | #ifdef CONFIG_ACPI_EC | 102 | #ifdef CONFIG_ACPI_EC |
102 | int acpi_ec_ecdt_probe(void); | 103 | int acpi_ec_ecdt_probe(void); |
104 | int acpi_boot_ec_enable(void); | ||
103 | #endif | 105 | #endif |
104 | 106 | ||
105 | /* -------------------------------------------------------------------------- | 107 | /* -------------------------------------------------------------------------- |
@@ -115,12 +117,17 @@ int acpi_processor_set_thermal_limit(acpi_handle handle, int type); | |||
115 | /*-------------------------------------------------------------------------- | 117 | /*-------------------------------------------------------------------------- |
116 | Dock Station | 118 | Dock Station |
117 | -------------------------------------------------------------------------- */ | 119 | -------------------------------------------------------------------------- */ |
120 | struct acpi_dock_ops { | ||
121 | acpi_notify_handler handler; | ||
122 | acpi_notify_handler uevent; | ||
123 | }; | ||
124 | |||
118 | #if defined(CONFIG_ACPI_DOCK) || defined(CONFIG_ACPI_DOCK_MODULE) | 125 | #if defined(CONFIG_ACPI_DOCK) || defined(CONFIG_ACPI_DOCK_MODULE) |
119 | extern int is_dock_device(acpi_handle handle); | 126 | extern int is_dock_device(acpi_handle handle); |
120 | extern int register_dock_notifier(struct notifier_block *nb); | 127 | extern int register_dock_notifier(struct notifier_block *nb); |
121 | extern void unregister_dock_notifier(struct notifier_block *nb); | 128 | extern void unregister_dock_notifier(struct notifier_block *nb); |
122 | extern int register_hotplug_dock_device(acpi_handle handle, | 129 | extern int register_hotplug_dock_device(acpi_handle handle, |
123 | acpi_notify_handler handler, | 130 | struct acpi_dock_ops *ops, |
124 | void *context); | 131 | void *context); |
125 | extern void unregister_hotplug_dock_device(acpi_handle handle); | 132 | extern void unregister_hotplug_dock_device(acpi_handle handle); |
126 | #else | 133 | #else |
@@ -136,7 +143,7 @@ static inline void unregister_dock_notifier(struct notifier_block *nb) | |||
136 | { | 143 | { |
137 | } | 144 | } |
138 | static inline int register_hotplug_dock_device(acpi_handle handle, | 145 | static inline int register_hotplug_dock_device(acpi_handle handle, |
139 | acpi_notify_handler handler, | 146 | struct acpi_dock_ops *ops, |
140 | void *context) | 147 | void *context) |
141 | { | 148 | { |
142 | return -ENODEV; | 149 | return -ENODEV; |