diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-01-19 09:53:43 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-01-19 09:53:43 -0500 |
| commit | 9e4c84967ef027fe50a03cf48dd6da9519c8e60c (patch) | |
| tree | 21d6b8168670f22521f3bb703e3b9d1932566c1c /tools/perf/builtin-buildid-list.c | |
| parent | d2f2fcd2541bae004db7f4798ffd9d2cb75ae817 (diff) | |
| parent | 3fb4a508b8e7957aa899f32cd6d9d462e102c7ca (diff) | |
Merge branch 'fix/hda' into topic/hda
Conflicts:
sound/pci/hda/patch_realtek.c
Diffstat (limited to 'tools/perf/builtin-buildid-list.c')
| -rw-r--r-- | tools/perf/builtin-buildid-list.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/builtin-buildid-list.c b/tools/perf/builtin-buildid-list.c index e693e6777af5..1e99ac806913 100644 --- a/tools/perf/builtin-buildid-list.c +++ b/tools/perf/builtin-buildid-list.c | |||
| @@ -17,7 +17,7 @@ | |||
| 17 | static char const *input_name = "perf.data"; | 17 | static char const *input_name = "perf.data"; |
| 18 | static int force; | 18 | static int force; |
| 19 | 19 | ||
| 20 | static const char *const buildid_list_usage[] = { | 20 | static const char * const buildid_list_usage[] = { |
| 21 | "perf buildid-list [<options>]", | 21 | "perf buildid-list [<options>]", |
| 22 | NULL | 22 | NULL |
| 23 | }; | 23 | }; |