diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/acpi/acpi_bus.h | 2 | ||||
-rw-r--r-- | include/acpi/acpi_drivers.h | 17 |
2 files changed, 18 insertions, 1 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index a2b3e390a503..f338e40bd544 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h | |||
@@ -334,7 +334,7 @@ int acpi_bus_add(struct acpi_device **child, struct acpi_device *parent, | |||
334 | acpi_handle handle, int type); | 334 | acpi_handle handle, int type); |
335 | int acpi_bus_trim(struct acpi_device *start, int rmdevice); | 335 | int acpi_bus_trim(struct acpi_device *start, int rmdevice); |
336 | int acpi_bus_start(struct acpi_device *device); | 336 | int acpi_bus_start(struct acpi_device *device); |
337 | 337 | acpi_status acpi_bus_get_ejd(acpi_handle handle, acpi_handle *ejd); | |
338 | int acpi_match_ids(struct acpi_device *device, char *ids); | 338 | int acpi_match_ids(struct acpi_device *device, char *ids); |
339 | int acpi_create_dir(struct acpi_device *); | 339 | int acpi_create_dir(struct acpi_device *); |
340 | void acpi_remove_dir(struct acpi_device *); | 340 | void acpi_remove_dir(struct acpi_device *); |
diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h index b425f9bb6d43..6a5bdcefec64 100644 --- a/include/acpi/acpi_drivers.h +++ b/include/acpi/acpi_drivers.h | |||
@@ -110,4 +110,21 @@ int acpi_processor_set_thermal_limit(acpi_handle handle, int type); | |||
110 | 110 | ||
111 | extern int acpi_specific_hotkey_enabled; | 111 | extern int acpi_specific_hotkey_enabled; |
112 | 112 | ||
113 | /*-------------------------------------------------------------------------- | ||
114 | Dock Station | ||
115 | -------------------------------------------------------------------------- */ | ||
116 | #if defined(CONFIG_ACPI_DOCK) || defined(CONFIG_ACPI_DOCK_MODULE) | ||
117 | extern int is_dock_device(acpi_handle handle); | ||
118 | extern int register_dock_notifier(struct notifier_block *nb); | ||
119 | extern void unregister_dock_notifier(struct notifier_block *nb); | ||
120 | extern int register_hotplug_dock_device(acpi_handle handle, | ||
121 | acpi_notify_handler handler, void *context); | ||
122 | extern void unregister_hotplug_dock_device(acpi_handle handle); | ||
123 | #else | ||
124 | #define is_dock_device(h) (0) | ||
125 | #define register_dock_notifier(nb) (-ENODEV) | ||
126 | #define unregister_dock_notifier(nb) do { } while(0) | ||
127 | #define register_hotplug_dock_device(h1, h2, c) (-ENODEV) | ||
128 | #define unregister_hotplug_dock_device(h) do { } while(0) | ||
129 | #endif | ||
113 | #endif /*__ACPI_DRIVERS_H__*/ | 130 | #endif /*__ACPI_DRIVERS_H__*/ |