git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[pandora-kernel.git]
/
kernel
/
trace
/
Makefile
diff --git
a/kernel/trace/Makefile
b/kernel/trace/Makefile
index
b3afe0e
..
b831087
100644
(file)
--- a/
kernel/trace/Makefile
+++ b/
kernel/trace/Makefile
@@
-60,5
+60,7
@@
endif
ifeq ($(CONFIG_TRACING),y)
obj-$(CONFIG_KGDB_KDB) += trace_kdb.o
endif
+obj-$(CONFIG_PROBE_EVENTS) += trace_probe.o
+obj-$(CONFIG_UPROBE_EVENT) += trace_uprobe.o
libftrace-y := ftrace.o