Pull bugzilla-7887 into release branch

diff --cc drivers/acpi/bus.c
Simple merge

diff --cc include/acpi/acpi_drivers.h
index 07a5eb036e96a01967c1d5264b2c5cceffe24373,ce0e62fb28c16084e00806b4b8b327b7ab37eddf..f6275b0e66dd34bbd5e3fde2be186eeda43ebba4
--- 1/include/acpi/acpi_drivers.h
--- 2/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__*/