Merge branch 'akpm' (patches from Andrew)

[linux-2.6-microblaze.git] / kernel / trace / Kconfig

diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig
index 3ee23f4..420ff4b 100644 (file)
--- a/kernel/trace/Kconfig
+++ b/kernel/trace/Kconfig
@@ -135,10 +135,9 @@ config TRACING_SUPPORT
        depends on STACKTRACE_SUPPORT
        default y
 
-if TRACING_SUPPORT
-
 menuconfig FTRACE
        bool "Tracers"
+       depends on TRACING_SUPPORT
        default y if DEBUG_KERNEL
        help
          Enable the kernel tracing infrastructure.
@@ -1037,6 +1036,3 @@ config HIST_TRIGGERS_DEBUG
           If unsure, say N.
 
 endif # FTRACE
-
-endif # TRACING_SUPPORT
-