Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / kernel / trace / Kconfig

diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig
index b516a8e19d510114f3f027b3458ba7e37ded4e33..fc382d6e2765d4a454a85aa5591c8edc452dccfb 100644 (file)
--- a/kernel/trace/Kconfig
+++ b/kernel/trace/Kconfig
@@ -81,21 +81,6 @@ config EVENT_TRACING
        select CONTEXT_SWITCH_TRACER
        bool
 
-config EVENT_POWER_TRACING_DEPRECATED
-       depends on EVENT_TRACING
-       bool "Deprecated power event trace API, to be removed"
-       default y
-       help
-         Provides old power event types:
-         C-state/idle accounting events:
-         power:power_start
-         power:power_end
-         and old cpufreq accounting event:
-         power:power_frequency
-         This is for userspace compatibility
-         and will vanish after 5 kernel iterations,
-         namely 3.1.
-
 config CONTEXT_SWITCH_TRACER
        bool