git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'dm-3.7-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-dm
[pandora-kernel.git]
/
kernel
/
time.c
diff --git
a/kernel/time.c
b/kernel/time.c
index
ba744cf
..
d226c6a
100644
(file)
--- a/
kernel/time.c
+++ b/
kernel/time.c
@@
-30,7
+30,7
@@
#include <linux/export.h>
#include <linux/timex.h>
#include <linux/capability.h>
-#include <linux/
clocksource
.h>
+#include <linux/
timekeeper_internal
.h>
#include <linux/errno.h>
#include <linux/syscalls.h>
#include <linux/security.h>