diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-02 01:06:15 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-02 01:06:15 -0500 |
| commit | 59ed2f59e4ea6a32f9591e378da7935f713a7000 (patch) | |
| tree | a1276a611dbb1bc44685ef8af363e99603e60047 /include/linux/kernel.h | |
| parent | 9ad11ab48b1ad618bf47076e9e579f267f5306c2 (diff) | |
| parent | b8e4d89357fc434618a59c1047cac72641191805 (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
Diffstat (limited to 'include/linux/kernel.h')
| -rw-r--r-- | include/linux/kernel.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index a5363324cf95..b49affa0ac5a 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h | |||
| @@ -185,6 +185,7 @@ extern enum system_states { | |||
| 185 | SYSTEM_HALT, | 185 | SYSTEM_HALT, |
| 186 | SYSTEM_POWER_OFF, | 186 | SYSTEM_POWER_OFF, |
| 187 | SYSTEM_RESTART, | 187 | SYSTEM_RESTART, |
| 188 | SYSTEM_SUSPEND_DISK, | ||
| 188 | } system_state; | 189 | } system_state; |
| 189 | 190 | ||
| 190 | #define TAINT_PROPRIETARY_MODULE (1<<0) | 191 | #define TAINT_PROPRIETARY_MODULE (1<<0) |