projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into core/urgent
[firefly-linux-kernel-4.4.55.git]
/
kernel
/
trace
/
trace_mmiotrace.c
diff --git
a/kernel/trace/trace_mmiotrace.c
b/kernel/trace/trace_mmiotrace.c
index 017fa376505d29a43fe1d69103047fe0365accb4..fd3c8aae55e5a17464e4ee7dbd82d77f0a831ea3 100644
(file)
--- a/
kernel/trace/trace_mmiotrace.c
+++ b/
kernel/trace/trace_mmiotrace.c
@@
-12,7
+12,7
@@
#include <linux/slab.h>
#include <linux/time.h>
-#include <
asm
/atomic.h>
+#include <
linux
/atomic.h>
#include "trace.h"
#include "trace_output.h"