Merge branch 'for-upstream/platform-x86_tpacpi' of git://repo.or.cz/linux-2.6/linux...

[mv-sheeva.git] / kernel / trace / Kconfig

diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig
index 60e2ce0181ee909f0b8cf8fc1d38ea8ab7bd1bf5..13e13d428cd37b96ca144b733c4c98fa4c7f257d 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
@@ -449,7 +440,7 @@ config BLK_DEV_IO_TRACE
 
 config KPROBE_EVENT
        depends on KPROBES
-       depends on X86
+       depends on HAVE_REGS_AND_STACK_ACCESS_API
        bool "Enable kprobes-based dynamic events"
        select TRACING
        default y