Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[deliverable/linux.git] / samples / Makefile

diff --git a/samples/Makefile b/samples/Makefile
index 13e4b470b5399b41a8f140b935bade02511c688e..43343a03b1f4a8cbeca3b1371802135366bbaea5 100644 (file)
--- a/samples/Makefile
+++ b/samples/Makefile
@@ -1,3 +1,3 @@
 # Makefile for Linux samples code
 
-obj-$(CONFIG_SAMPLES)  += markers/ kobject/ kprobes/ tracepoints/ trace_events/
+obj-$(CONFIG_SAMPLES)  += kobject/ kprobes/ tracepoints/ trace_events/