Pull bugzilla-7887 into release branch

This commit is contained in:
Len Brown 2007-02-16 22:11:57 -05:00
commit 902b236c08
4 changed files with 27 additions and 12 deletions

View file

@ -136,4 +136,14 @@ 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__*/