summaryrefslogtreecommitdiff
path: root/include/acpi
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2007-02-16 22:11:57 -0500
committerLen Brown <len.brown@intel.com>2007-02-16 22:11:57 -0500
commit902b236c087bf021c94cc21a2b09d928c4156c2b (patch)
treec62e6a6d8dedcff68e90e3cd153789f87cc67fb6 /include/acpi
parent08e4a10ec82faf5ba67c8d0115b7bc9e58071555 (diff)
parentaafbcd165a2a02e6dff173f66772b3148229ace8 (diff)
downloadlinux-3.10-902b236c087bf021c94cc21a2b09d928c4156c2b.tar.gz
linux-3.10-902b236c087bf021c94cc21a2b09d928c4156c2b.tar.bz2
linux-3.10-902b236c087bf021c94cc21a2b09d928c4156c2b.zip
Pull bugzilla-7887 into release branch
Diffstat (limited to 'include/acpi')
-rw-r--r--include/acpi/acpi_drivers.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h
index 07a5eb036e9..f6275b0e66d 100644
--- a/include/acpi/acpi_drivers.h
+++ b/include/acpi/acpi_drivers.h
@@ -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__*/