projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-3.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...
[cascardo/linux.git]
/
drivers
/
clocksource
/
tegra20_timer.c
diff --git
a/drivers/clocksource/tegra20_timer.c
b/drivers/clocksource/tegra20_timer.c
index
ae877b0
..
9396170
100644
(file)
--- a/
drivers/clocksource/tegra20_timer.c
+++ b/
drivers/clocksource/tegra20_timer.c
@@
-26,10
+26,10
@@
#include <linux/io.h>
#include <linux/of_address.h>
#include <linux/of_irq.h>
+#include <linux/sched_clock.h>
#include <asm/mach/time.h>
#include <asm/smp_twd.h>
-#include <asm/sched_clock.h>
#define RTC_SECONDS 0x08
#define RTC_SHADOW_SECONDS 0x0c