diff --git a/[refs] b/[refs] index eabd75a36841..09eeef89b1ae 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 97572751d78133cf9a5f7165b252bf975f9dd17d +refs/heads/master: 83ba7c34d2b82dc608647f629616df393ab883f9 diff --git a/trunk/include/linux/ftrace.h b/trunk/include/linux/ftrace.h index dc3b1328aaeb..3c0924a18daf 100644 --- a/trunk/include/linux/ftrace.h +++ b/trunk/include/linux/ftrace.h @@ -446,7 +446,6 @@ static inline void unpause_graph_tracing(void) { } #endif /* CONFIG_FUNCTION_GRAPH_TRACER */ #ifdef CONFIG_TRACING -#include /* flags for current->trace */ enum {