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

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

diff --git a/samples/Kconfig b/samples/Kconfig
index 17d64ba..e4be84a 100644 (file)
--- a/samples/Kconfig
+++ b/samples/Kconfig
@@ -7,12 +7,6 @@ menuconfig SAMPLES
 
 if SAMPLES
 
-config SAMPLE_MARKERS
-       tristate "Build markers examples -- loadable modules only"
-       depends on MARKERS && m
-       help
-         This build markers example modules.
-
 config SAMPLE_TRACEPOINTS
        tristate "Build tracepoints examples -- loadable modules only"
        depends on TRACEPOINTS && m