Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core

[mv-sheeva.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index f763762d544a135a0a06f67f36701b9f0d331140..f291f086caa1c2e89909ffe5f910786a331ff588 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -808,6 +808,7 @@ config TRACEPOINTS
 
 config MARKERS
        bool "Activate markers"
+       depends on TRACEPOINTS
        help
          Place an empty function call at each marker site. Can be
          dynamically changed for a probe function.