From 7e9b4082f040915479ed20931fa6a4fb74eb8519 Mon Sep 17 00:00:00 2001
From: Frederic Weisbecker <fweisbec@gmail.com>
Date: Thu, 27 Aug 2009 18:17:34 +0200
Subject: [PATCH] --- yaml --- r: 158463 b: refs/heads/master c:
 6c347d43eea29221a8ebab9ff9cbe7a00cddac98 h: refs/heads/master i:   158461:
 240c7065346f0a247265a91a3de03436f26f9992   158459:
 18602add5554f43bd0d6bed7f68e26f87152baa2   158455:
 546be81f9a5a0b40ff123aa2080a6bf811a010e6   158447:
 b7959c43f7a3e27dc973d4a350ed2727a4f0b152   158431:
 2457e4de6671d86e44bcf6b118cf64c69c56d73e   158399:
 48f0504140c3f4894f67f4c3be06d0732f2560b1   158335:
 5d36b2e7e304e4eecc4e98f628298ccc0ce769ed   158207:
 09c818ffd82f75cdad1376b6f2cbc9b05d5de57e v: v3

---
 [refs]                             | 2 +-
 trunk/include/trace/define_trace.h | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 7e3192a396f2..94693737ba69 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 35dce1a99d010f3d738af4ce1b9b77302fdfe69c
+refs/heads/master: 6c347d43eea29221a8ebab9ff9cbe7a00cddac98
diff --git a/trunk/include/trace/define_trace.h b/trunk/include/trace/define_trace.h
index a89ed590597a..2a4b3bf74033 100644
--- a/trunk/include/trace/define_trace.h
+++ b/trunk/include/trace/define_trace.h
@@ -62,6 +62,7 @@
 #endif
 
 #undef TRACE_EVENT
+#undef TRACE_EVENT_FN
 #undef TRACE_HEADER_MULTI_READ
 
 /* Only undef what we defined in this file */