From: Len Brown <len.brown@intel.com>
Date: Sat, 17 Feb 2007 03:11:57 +0000 (-0500)
Subject: Pull bugzilla-7887 into release branch
X-Git-Tag: v2.6.21-rc1~84
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=902b236c087bf021c94cc21a2b09d928c4156c2b;p=linux-2.6-omap-h63xx.git

Pull bugzilla-7887 into release branch
---

902b236c087bf021c94cc21a2b09d928c4156c2b
diff --cc include/acpi/acpi_drivers.h
index 07a5eb036e9,ce0e62fb28c..f6275b0e66d
--- a/include/acpi/acpi_drivers.h
+++ b/include/acpi/acpi_drivers.h
@@@ -116,24 -122,20 +116,34 @@@ extern int register_hotplug_dock_device
  	acpi_notify_handler handler, void *context);
  extern void unregister_hotplug_dock_device(acpi_handle handle);
  #else
 -#define is_dock_device(h)			(0)
 -#define register_dock_notifier(nb) 		(-ENODEV)
 -#define unregister_dock_notifier(nb)           	do { } while(0)
 -#define register_hotplug_dock_device(h1, h2, c)	(-ENODEV)
 -#define unregister_hotplug_dock_device(h)       do { } while(0)
 +static inline int is_dock_device(acpi_handle handle)
 +{
 +	return 0;
 +}
 +static inline int register_dock_notifier(struct notifier_block *nb)
 +{
 +	return -ENODEV;
 +}
 +static inline void unregister_dock_notifier(struct notifier_block *nb)
 +{
 +}
 +static inline int register_hotplug_dock_device(acpi_handle handle,
 +				acpi_notify_handler handler, void *context)
 +{
 +	return -ENODEV;
 +}
 +static inline void unregister_hotplug_dock_device(acpi_handle handle)
 +{
 +}
  #endif
+ 
+ /*--------------------------------------------------------------------------
+                                   Suspend/Resume
+   -------------------------------------------------------------------------- */
+ #ifdef CONFIG_ACPI_SLEEP
+ extern int acpi_sleep_init(void);
+ #else
+ #define acpi_sleep_init() do {} while (0)
+ #endif
+ 
  #endif /*__ACPI_DRIVERS_H__*/