summaryrefslogtreecommitdiffstats
path: root/include/acpi
diff options
context:
space:
mode:
authorAlexey Starikovskiy <alexey.y.starikovskiy@linux.intel.com>2007-02-10 07:32:16 +0100
committerLen Brown <len.brown@intel.com>2007-02-10 07:32:16 +0100
commitaafbcd165a2a02e6dff173f66772b3148229ace8 (patch)
tree57b808dad805d7708721e3c0ebddb718a14a3328 /include/acpi
parentACPI: Disable GPEs in preparation for sleep. (diff)
downloadlinux-aafbcd165a2a02e6dff173f66772b3148229ace8.tar.xz
linux-aafbcd165a2a02e6dff173f66772b3148229ace8.zip
ACPI: invoke acpi_sleep_init() earlier
late_initcall() is too late for acpi_sleep_init(). Call it directly from acpi_init code. http://bugzilla.kernel.org/show_bug.cgi?id=7887 Signed-off-by: Alexey Starikovskiy <alexey.y.starikovskiy@linux.intel.com> Signed-off-by: Vladimir Lebedev <vladimir.p.lebedev@intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
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 4dc8a5043ef0..ce0e62fb28c1 100644
--- a/include/acpi/acpi_drivers.h
+++ b/include/acpi/acpi_drivers.h
@@ -128,4 +128,14 @@ extern void unregister_hotplug_dock_device(acpi_handle handle);
#define register_hotplug_dock_device(h1, h2, c) (-ENODEV)
#define unregister_hotplug_dock_device(h) do { } while(0)
#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__*/