Merge branches 'tracing/branch-tracer' and 'tracing/urgent' into tracing/core

[sfrench/cifs-2.6.git] / kernel / trace / trace.c

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 396fda034e3f7e19ed277248807006264f95303d..2596b5a968c46424785b500d9fcc57b50dd7e4fa 100644 (file)
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -259,9 +259,7 @@ static const char *trace_options[] = {
        "sched-tree",
        "ftrace_printk",
        "ftrace_preempt",
-#ifdef CONFIG_BRANCH_TRACER
        "branch",
-#endif
        "annotate",
        NULL
 };