git.samba.org
/
sfrench
/
cifs-2.6.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/jikos/hid
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-omap2
/
pm-debug.c
diff --git
a/arch/arm/mach-omap2/pm-debug.c
b/arch/arm/mach-omap2/pm-debug.c
index 003a6cb248bec3cdce7646f2480c2157589af5e9..5c46ea6756d7b1dcbe8e6a6afd9cddc556880e04 100644
(file)
--- a/
arch/arm/mach-omap2/pm-debug.c
+++ b/
arch/arm/mach-omap2/pm-debug.c
@@
-21,6
+21,7
@@
#include <linux/kernel.h>
#include <linux/sched.h>
+#include <linux/sched/clock.h>
#include <linux/clk.h>
#include <linux/err.h>
#include <linux/io.h>