summaryrefslogtreecommitdiff
path: root/drivers/char
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-01-15 23:09:31 +0100
committerIngo Molnar <mingo@elte.hu>2009-01-15 23:09:31 +0100
commit603a92e420ba17b32726bbddbb158f5e908a4423 (patch)
treee242604b461705628694b10afedf83cf241349e8 /drivers/char
parent5393f780277165f282a37ed82dd878159ec9dad5 (diff)
parent32632920a788fb13da35b131b77cc4324c38c1c5 (diff)
Merge branch 'tracing/core' into auto-ftrace-next
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/sysrq.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/sysrq.c b/drivers/char/sysrq.c
index d41b9f6f7903..985dc8f6c747 100644
--- a/drivers/char/sysrq.c
+++ b/drivers/char/sysrq.c
@@ -283,7 +283,7 @@ static void sysrq_ftrace_dump(int key, struct tty_struct *tty)
}
static struct sysrq_key_op sysrq_ftrace_dump_op = {
.handler = sysrq_ftrace_dump,
- .help_msg = "dumpZ-ftrace-buffer",
+ .help_msg = "dump-ftrace-buffer(Z)",
.action_msg = "Dump ftrace buffer",
.enable_mask = SYSRQ_ENABLE_DUMP,
};