diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-07 01:47:12 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-07 01:47:12 -0500 |
| commit | 3c9b3a8575b4f2551e3b5b74ffa1c3559c6338eb (patch) | |
| tree | 7f8d84353852401ec74e005f6f0b1eb958b9a70d /include/linux/kernel.h | |
| parent | c0d3c0c0ce94d3db893577ae98e64414d92e49d8 (diff) | |
| parent | c03296a868ae7c91aa2d8b372184763b18f16d7a (diff) | |
Merge branch 'master'
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) |