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-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
[cascardo/linux.git]
/
arch
/
arm
/
mach-ux500
/
timer.c
diff --git
a/arch/arm/mach-ux500/timer.c
b/arch/arm/mach-ux500/timer.c
index
aa2a78a
..
a6af0b8
100644
(file)
--- a/
arch/arm/mach-ux500/timer.c
+++ b/
arch/arm/mach-ux500/timer.c
@@
-17,6
+17,8
@@
#include <mach/hardware.h>
#include <mach/irqs.h>
+#include "id.h"
+
#ifdef CONFIG_HAVE_ARM_TWD
static DEFINE_TWD_LOCAL_TIMER(u8500_twd_local_timer,
U8500_TWD_BASE, IRQ_LOCALTIMER);