aboutsummaryrefslogtreecommitdiffstats
path: root/include/acpi
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2007-02-16 18:52:41 -0500
committerLen Brown <len.brown@intel.com>2007-02-16 18:52:41 -0500
commit81450b73dde07f473a4a7208b209b4c8b7251d90 (patch)
tree94e676c74c32f2a74dc306cf863d7e190777f2ab /include/acpi
parent8a03d9a498eaf02c8a118752050a5154852c13bf (diff)
parent0539771d7236b425f285652f6f297cc7939c8f9a (diff)
Pull misc-for-upstream into release branch
Conflicts: drivers/usb/misc/appledisplay.c Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include/acpi')
-rw-r--r--include/acpi/acpi_drivers.h24
-rw-r--r--include/acpi/acpiosxf.h6
2 files changed, 19 insertions, 11 deletions
diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h
index 4dc8a5043ef0..3d7ebe0e4fc2 100644
--- a/include/acpi/acpi_drivers.h
+++ b/include/acpi/acpi_drivers.h
@@ -122,10 +122,24 @@ extern int register_hotplug_dock_device(acpi_handle handle,
122 acpi_notify_handler handler, void *context); 122 acpi_notify_handler handler, void *context);
123extern void unregister_hotplug_dock_device(acpi_handle handle); 123extern void unregister_hotplug_dock_device(acpi_handle handle);
124#else 124#else
125#define is_dock_device(h) (0) 125static inline int is_dock_device(acpi_handle handle)
126#define register_dock_notifier(nb) (-ENODEV) 126{
127#define unregister_dock_notifier(nb) do { } while(0) 127 return 0;
128#define register_hotplug_dock_device(h1, h2, c) (-ENODEV) 128}
129#define unregister_hotplug_dock_device(h) do { } while(0) 129static inline int register_dock_notifier(struct notifier_block *nb)
130{
131 return -ENODEV;
132}
133static inline void unregister_dock_notifier(struct notifier_block *nb)
134{
135}
136static inline int register_hotplug_dock_device(acpi_handle handle,
137 acpi_notify_handler handler, void *context)
138{
139 return -ENODEV;
140}
141static inline void unregister_hotplug_dock_device(acpi_handle handle)
142{
143}
130#endif 144#endif
131#endif /*__ACPI_DRIVERS_H__*/ 145#endif /*__ACPI_DRIVERS_H__*/
diff --git a/include/acpi/acpiosxf.h b/include/acpi/acpiosxf.h
index 781394b9efe0..2785058c82ab 100644
--- a/include/acpi/acpiosxf.h
+++ b/include/acpi/acpiosxf.h
@@ -240,12 +240,6 @@ acpi_status
240acpi_os_validate_address(u8 space_id, 240acpi_os_validate_address(u8 space_id,
241 acpi_physical_address address, acpi_size length); 241 acpi_physical_address address, acpi_size length);
242 242
243u8 acpi_os_readable(void *pointer, acpi_size length);
244
245#ifdef ACPI_FUTURE_USAGE
246u8 acpi_os_writable(void *pointer, acpi_size length);
247#endif
248
249u64 acpi_os_get_timer(void); 243u64 acpi_os_get_timer(void);
250 244
251acpi_status acpi_os_signal(u32 function, void *info); 245acpi_status acpi_os_signal(u32 function, void *info);