diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-03-09 13:55:17 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-03-09 13:55:17 -0500 |
| commit | b675b3667f6729dcd1036a2a129b35445947f905 (patch) | |
| tree | 0d58791e9063d3ca2c352da6f3e7df2bdb876f9d /include/linux/kmsg_dump.h | |
| parent | 104a5f3cad8f2f27cadbdf0029400ecd9e17ccc0 (diff) | |
| parent | 192cfd58774b4d17b2fe8bdc77d89c2ef4e0591d (diff) | |
Merge commit 'v3.3-rc6' into next
Diffstat (limited to 'include/linux/kmsg_dump.h')
| -rw-r--r-- | include/linux/kmsg_dump.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/kmsg_dump.h b/include/linux/kmsg_dump.h index ee0c952188de..fee66317e071 100644 --- a/include/linux/kmsg_dump.h +++ b/include/linux/kmsg_dump.h | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | enum kmsg_dump_reason { | 18 | enum kmsg_dump_reason { |
| 19 | KMSG_DUMP_OOPS, | 19 | KMSG_DUMP_OOPS, |
| 20 | KMSG_DUMP_PANIC, | 20 | KMSG_DUMP_PANIC, |
| 21 | KMSG_DUMP_KEXEC, | ||
| 22 | KMSG_DUMP_RESTART, | 21 | KMSG_DUMP_RESTART, |
| 23 | KMSG_DUMP_HALT, | 22 | KMSG_DUMP_HALT, |
| 24 | KMSG_DUMP_POWEROFF, | 23 | KMSG_DUMP_POWEROFF, |