diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-01-31 09:13:14 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-01-31 09:13:14 -0500 |
| commit | ea51e5040e24eefe44d70bc654a237ca1f0225b0 (patch) | |
| tree | df2e5922dcdfafae62a10d8cd97f98121064fc23 /include/linux/kmsg_dump.h | |
| parent | 3422a47041b8cb8f14ac1e3926bcf711121df6dc (diff) | |
| parent | 8dbd52daee38adaae4d5a674bcca837e694a4f4c (diff) | |
Merge branch 'fix/asoc' into for-linus
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, |