Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next

[linux-2.6-omap-h63xx.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 0f5af409fef1f8d8669d978686afa57b86fc4515..8a63c404ef449d391a08ffd5760f46325f76babf 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -815,6 +815,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.