aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/kernel.h
diff options
context:
space:
mode:
authorAlexey Starikovskiy <alexey.y.starikovskiy@intel.com>2005-12-01 04:29:00 -0500
committerLen Brown <len.brown@intel.com>2005-12-15 13:28:14 -0500
commit729b4d4ce1982c52040bbf22d6711cdf8db07ad8 (patch)
tree1ae8b12dcbcd17c364f2df28db8ab3db9c8b89a2 /include/linux/kernel.h
parent7116317dc9148d783846299fc80a7d377baa6dca (diff)
[ACPI] fix reboot upon suspend-to-disk
http://bugzilla.kernel.org/show_bug.cgi?id=4320 Signed-off-by: Alexey Starikovskiy <alexey.y.starikovskiy@intel.com> Acked-by: Pavel Machek <pavel@suse.cz> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include/linux/kernel.h')
-rw-r--r--include/linux/kernel.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index b1e407a4fbda..73aa55a73334 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -181,6 +181,7 @@ extern enum system_states {
181 SYSTEM_HALT, 181 SYSTEM_HALT,
182 SYSTEM_POWER_OFF, 182 SYSTEM_POWER_OFF,
183 SYSTEM_RESTART, 183 SYSTEM_RESTART,
184 SYSTEM_SUSPEND_DISK,
184} system_state; 185} system_state;
185 186
186#define TAINT_PROPRIETARY_MODULE (1<<0) 187#define TAINT_PROPRIETARY_MODULE (1<<0)