Merge commit 'perf/core' into perf/hw-breakpoint

[safe/jmp/linux-2.6] / samples / Makefile

diff --git a/samples/Makefile b/samples/Makefile
index 42e1755..0f15e6d 100644 (file)
--- a/samples/Makefile
+++ b/samples/Makefile
@@ -1,4 +1,4 @@
 # Makefile for Linux samples code
 
-obj-$(CONFIG_SAMPLES)  += markers/ kobject/ kprobes/ tracepoints/ \
-                       trace_events/ hw_breakpoint/
+obj-$(CONFIG_SAMPLES)  += kobject/ kprobes/ tracepoints/ trace_events/ \
+                          hw_breakpoint/