Merge master.kernel.org:/home/rmk/linux-2.6-arm

[~andy/linux] / samples / Kconfig

diff --git a/samples/Kconfig b/samples/Kconfig
index 428b065ba6959791e4f7ab4c180a914c9e3ba917..b92bde3c6a89e7fdb09721f1e29a5aa3105c604a 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