summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2008-12-29 12:53:54 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2008-12-29 12:53:54 +1100
commit6927d0e167aedb1376592dcda5671f6bfaa4e931 (patch)
tree0ad9fa81da414b08bb23239e31a101979b4b5e4c /drivers
parentc02508b90e7d0832b9faf4d2e3e78364965c2133 (diff)
parentcf22627f1b759a5ffdc4e8d7c1f97d0698aeedf7 (diff)
Merge commit 'ftrace/auto-ftrace-next'
Diffstat (limited to 'drivers')
-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 94966edfb44d..785a08ef9a13 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,
};