diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-12-01 09:18:12 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-12-01 09:22:19 +0100 |
| commit | b3d006c0e745bfd2dab4984ffe3279d5cf4e926a (patch) | |
| tree | 4d1e831872d397cc5bb9cdab6c0e239a0080909c /tools/perf/Makefile | |
| parent | 4c635a4e04700a371ef7e4d4bb33ed88747e801e (diff) | |
| parent | 133dc4c39c57eeef2577ca5b4ed24765b7a78ce2 (diff) | |
| download | linux-3.10-b3d006c0e745bfd2dab4984ffe3279d5cf4e926a.tar.gz linux-3.10-b3d006c0e745bfd2dab4984ffe3279d5cf4e926a.tar.bz2 linux-3.10-b3d006c0e745bfd2dab4984ffe3279d5cf4e926a.zip | |
Merge branch 'perf/rename' into perf/core
Merge reason: This is an older commit under testing that was not pushed yet - merge it.
Also fix up the merge in command-list.txt.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Acked-by: Tom Zanussi <tzanussi@gmail.com>
Diffstat (limited to 'tools/perf/Makefile')
| -rw-r--r-- | tools/perf/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/Makefile b/tools/perf/Makefile index e0db1978c85..d88137a4356 100644 --- a/tools/perf/Makefile +++ b/tools/perf/Makefile @@ -495,7 +495,7 @@ BUILTIN_OBJS += $(OUTPUT)builtin-report.o BUILTIN_OBJS += $(OUTPUT)builtin-stat.o BUILTIN_OBJS += $(OUTPUT)builtin-timechart.o BUILTIN_OBJS += $(OUTPUT)builtin-top.o -BUILTIN_OBJS += $(OUTPUT)builtin-trace.o +BUILTIN_OBJS += $(OUTPUT)builtin-script.o BUILTIN_OBJS += $(OUTPUT)builtin-probe.o BUILTIN_OBJS += $(OUTPUT)builtin-kmem.o BUILTIN_OBJS += $(OUTPUT)builtin-lock.o |