Merge branch 'tip/tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git...

[safe/jmp/linux-2.6] / kernel / trace / Kconfig

diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig
index 60e2ce0..e6b99b8 100644 (file)
--- a/kernel/trace/Kconfig
+++ b/kernel/trace/Kconfig
@@ -328,15 +328,6 @@ config BRANCH_TRACER
 
          Say N if unsure.
 
-config POWER_TRACER
-       bool "Trace power consumption behavior"
-       depends on X86
-       select GENERIC_TRACER
-       help
-         This tracer helps developers to analyze and optimize the kernel's
-         power management decisions, specifically the C-state and P-state
-         behavior.
-
 config KSYM_TRACER
        bool "Trace read and write access on kernel memory locations"
        depends on HAVE_HW_BREAKPOINT