diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2010-08-11 01:20:14 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2010-08-11 01:20:14 -0400 |
| commit | 21ee0ab5fa80eb7307079e1a126f642fe7a937a6 (patch) | |
| tree | f32505494b46b02cd9072fc399b57d73e27f1c98 /tools/perf/builtin-diff.c | |
| parent | 5aa8d1a23dfdc1e331c134164009cc929c63447e (diff) | |
| parent | 7987abe499b0721ca8a5629758e0ce3e07d34dc6 (diff) | |
Merge remote branch 'willd/for-linaro'
Conflicts:
arch/arm/mm/flush.c
Diffstat (limited to 'tools/perf/builtin-diff.c')
| -rw-r--r-- | tools/perf/builtin-diff.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tools/perf/builtin-diff.c b/tools/perf/builtin-diff.c index a6e2fdc7a04..33730c8211d 100644 --- a/tools/perf/builtin-diff.c +++ b/tools/perf/builtin-diff.c @@ -185,8 +185,6 @@ static const struct option options[] = { OPT_BOOLEAN('f', "force", &force, "don't complain, do it"), OPT_BOOLEAN('m', "modules", &symbol_conf.use_modules, "load module symbols - WARNING: use only with -k and LIVE kernel"), - OPT_BOOLEAN('P', "full-paths", &symbol_conf.full_paths, - "Don't shorten the pathnames taking into account the cwd"), OPT_STRING('d', "dsos", &symbol_conf.dso_list_str, "dso[,dso...]", "only consider symbols in these dsos"), OPT_STRING('C', "comms", &symbol_conf.comm_list_str, "comm[,comm...]", |