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 branch 'timers/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
kernel
/
time
/
tick-oneshot.c
diff --git
a/kernel/time/tick-oneshot.c
b/kernel/time/tick-oneshot.c
index
0258d31
..
450c049
100644
(file)
--- a/
kernel/time/tick-oneshot.c
+++ b/
kernel/time/tick-oneshot.c
@@
-14,7
+14,7
@@
#include <linux/cpu.h>
#include <linux/err.h>
#include <linux/hrtimer.h>
-#include <linux/i
rq
.h>
+#include <linux/i
nterrupt
.h>
#include <linux/percpu.h>
#include <linux/profile.h>
#include <linux/sched.h>