diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-02-17 08:24:46 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-02-17 08:24:46 -0500 |
| commit | 7fb3a069bc5d3577409c2ae89f89cd264ff85816 (patch) | |
| tree | 7fe3ba3b95faeecb01e4feafb9288ef4b523c6b3 /kernel/printk.c | |
| parent | 291186e049d7f8178ad31d43c38a53889f25d79e (diff) | |
| parent | 9d3415a8cc76ff65c6602a121ac318432c5cd7ba (diff) | |
Merge branch 'fix/misc' into topic/misc
Conflicts:
sound/pci/hda/patch_realtek.c
Diffstat (limited to 'kernel/printk.c')
| -rw-r--r-- | kernel/printk.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/printk.c b/kernel/printk.c index 17463ca2e22..1751c456b71 100644 --- a/kernel/printk.c +++ b/kernel/printk.c | |||
| @@ -1467,6 +1467,7 @@ EXPORT_SYMBOL_GPL(kmsg_dump_unregister); | |||
| 1467 | static const char const *kmsg_reasons[] = { | 1467 | static const char const *kmsg_reasons[] = { |
| 1468 | [KMSG_DUMP_OOPS] = "oops", | 1468 | [KMSG_DUMP_OOPS] = "oops", |
| 1469 | [KMSG_DUMP_PANIC] = "panic", | 1469 | [KMSG_DUMP_PANIC] = "panic", |
| 1470 | [KMSG_DUMP_KEXEC] = "kexec", | ||
| 1470 | }; | 1471 | }; |
| 1471 | 1472 | ||
| 1472 | static const char *kmsg_to_str(enum kmsg_dump_reason reason) | 1473 | static const char *kmsg_to_str(enum kmsg_dump_reason reason) |