diff options
author | 2010-02-16 11:19:18 +0100 | |
---|---|---|
committer | 2010-02-16 11:19:18 +0100 | |
commit | ba9341dfef6b0201cd30e3904dcd0a47d3dc35e0 (patch) | |
tree | d83637979db83bb9d5a23e190148b90b60c976d2 /tools/perf/builtin-trace.c | |
parent | ALSA: USB MIDI support for Access Music VirusTI (diff) | |
parent | ALSA: usb-audio: reduce MIDI packet size to work around broken firmware (diff) | |
download | linux-dev-ba9341dfef6b0201cd30e3904dcd0a47d3dc35e0.tar.xz linux-dev-ba9341dfef6b0201cd30e3904dcd0a47d3dc35e0.zip |
Merge branch 'fixes' into devel
Diffstat (limited to 'tools/perf/builtin-trace.c')
-rw-r--r-- | tools/perf/builtin-trace.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c index e2285e28720f..574a215e800b 100644 --- a/tools/perf/builtin-trace.c +++ b/tools/perf/builtin-trace.c @@ -512,7 +512,7 @@ static char *get_script_path(const char *script_root, const char *suffix) return path; } -static const char * const annotate_usage[] = { +static const char * const trace_usage[] = { "perf trace [<options>] <command>", NULL }; @@ -581,7 +581,7 @@ int cmd_trace(int argc, const char **argv, const char *prefix __used) setup_scripting(); - argc = parse_options(argc, argv, options, annotate_usage, + argc = parse_options(argc, argv, options, trace_usage, PARSE_OPT_STOP_AT_NON_OPTION); if (symbol__init() < 0) |