diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-02-08 02:55:43 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-02-08 02:55:46 -0500 |
| commit | 6d3e0907b8b239d16720d144e2675ecf10d3bc3b (patch) | |
| tree | e0b0743b5f6f82b057cafc4f3687396a6e01a0b4 /tools/perf/builtin-diff.c | |
| parent | 23577256953c870de9b724c3a2611ce7be6a1e4e (diff) | |
| parent | 50200df462023b187d80a99a52f5f2cfe3c86c26 (diff) | |
Merge branch 'sched/urgent' into sched/core
Merge reason: Merge dependent fix, update to latest -rc.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'tools/perf/builtin-diff.c')
| -rw-r--r-- | tools/perf/builtin-diff.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/perf/builtin-diff.c b/tools/perf/builtin-diff.c index 4d33b55d5584..bd71b8ceafb7 100644 --- a/tools/perf/builtin-diff.c +++ b/tools/perf/builtin-diff.c | |||
| @@ -189,8 +189,9 @@ out_delete: | |||
| 189 | return ret; | 189 | return ret; |
| 190 | } | 190 | } |
| 191 | 191 | ||
| 192 | static const char *const diff_usage[] = { | 192 | static const char * const diff_usage[] = { |
| 193 | "perf diff [<options>] [old_file] [new_file]", | 193 | "perf diff [<options>] [old_file] [new_file]", |
| 194 | NULL, | ||
| 194 | }; | 195 | }; |
| 195 | 196 | ||
| 196 | static const struct option options[] = { | 197 | static const struct option options[] = { |