Merge branch 'topic/hda' into for-linus

[karo-tx-linux.git] / kernel / trace / events.c

diff --git a/kernel/trace/events.c b/kernel/trace/events.c
index f2509cbaacea3d38c21b3fc17ce2644d4e681d92..246f2aa6dc468457846cd5e1dd48e89b92d245ae 100644 (file)
--- a/kernel/trace/events.c
+++ b/kernel/trace/events.c
@@ -2,9 +2,7 @@
  * This is the place to register all trace points as events.
  */
 
-/* someday this needs to go in a generic header */
-#define __STR(x) #x
-#define STR(x) __STR(x)
+#include <linux/stringify.h>
 
 #include <trace/trace_events.h>
 
@@ -14,4 +12,3 @@
 #include "trace_events_stage_2.h"
 #include "trace_events_stage_3.h"
 
-#include <trace/trace_event_types.h>