diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2010-09-23 18:14:25 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2010-09-23 18:14:25 -0400 |
| commit | af41ffe13947069a95dad4738da0159ebd0fe84c (patch) | |
| tree | c54c35a3cb95ded5c6cbbdf9b17edc9bd582038e /Makefile | |
| parent | 296971a9f44762c409adc60c9f13fb5ceb9ad5ae (diff) | |
| parent | eae46f152079cd3603d02258b54504a9aa29f04c (diff) | |
Merge remote branch 'push/trace-cmd-kvm' into trace-cmd
Conflicts:
Makefile
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
| @@ -265,7 +265,7 @@ TCMD_LIB_OBJS = $(PEVENT_LIB_OBJS) trace-util.o trace-input.o trace-ftrace.o \ | |||
| 265 | trace-output.o trace-record.o trace-restore.o | 265 | trace-output.o trace-record.o trace-restore.o |
| 266 | 266 | ||
| 267 | PLUGIN_OBJS = plugin_hrtimer.o plugin_kmem.o plugin_sched_switch.o \ | 267 | PLUGIN_OBJS = plugin_hrtimer.o plugin_kmem.o plugin_sched_switch.o \ |
| 268 | plugin_mac80211.o plugin_jbd2.o plugin_function.o | 268 | plugin_mac80211.o plugin_jbd2.o plugin_function.o plugin_kvm.o |
| 269 | 269 | ||
| 270 | PLUGINS := $(PLUGIN_OBJS:.o=.so) | 270 | PLUGINS := $(PLUGIN_OBJS:.o=.so) |
| 271 | 271 | ||