From 158562a21cbf87238c30551077531456b14c0891 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 28 Feb 2012 11:02:46 +0000
Subject: [PATCH] --- yaml --- r: 298308 b: refs/heads/master c:
 fa73dc9400516945bcbae8d98c23393bcefe1440 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/kernel/trace/trace.h | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index fccb222fcf46..cf54813c01f5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: db6544e0075d192e5ad16eda8689c55fa9c6f8f4
+refs/heads/master: fa73dc9400516945bcbae8d98c23393bcefe1440
diff --git a/trunk/kernel/trace/trace.h b/trunk/kernel/trace/trace.h
index ce887c0eca56..95059f091a24 100644
--- a/trunk/kernel/trace/trace.h
+++ b/trunk/kernel/trace/trace.h
@@ -836,13 +836,11 @@ extern const char *__stop___trace_bprintk_fmt[];
 		     filter)
 #include "trace_entries.h"
 
-#ifdef CONFIG_PERF_EVENTS
 #ifdef CONFIG_FUNCTION_TRACER
 int perf_ftrace_event_register(struct ftrace_event_call *call,
 			       enum trace_reg type, void *data);
 #else
 #define perf_ftrace_event_register NULL
 #endif /* CONFIG_FUNCTION_TRACER */
-#endif /* CONFIG_PERF_EVENTS */
 
 #endif /* _LINUX_KERNEL_TRACE_H */