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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[firefly-linux-kernel-4.4.55.git]
/
kernel
/
power
/
main.c
diff --git
a/kernel/power/main.c
b/kernel/power/main.c
index 9a59d042ea84f67c40537f2bfbcf7593a05d8716..86e8157a450f51c1ac592d9c8d2fa4a09e47c21f 100644
(file)
--- a/
kernel/power/main.c
+++ b/
kernel/power/main.c
@@
-11,7
+11,7
@@
#include <linux/export.h>
#include <linux/kobject.h>
#include <linux/string.h>
-#include <linux/
resume
-trace.h>
+#include <linux/
pm
-trace.h>
#include <linux/workqueue.h>
#include <linux/debugfs.h>
#include <linux/seq_file.h>