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 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
[pandora-kernel.git]
/
arch
/
arm
/
mach-vexpress
/
ct-ca9x4.c
diff --git
a/arch/arm/mach-vexpress/ct-ca9x4.c
b/arch/arm/mach-vexpress/ct-ca9x4.c
index
c2e405a
..
fd25ccd
100644
(file)
--- a/
arch/arm/mach-vexpress/ct-ca9x4.c
+++ b/
arch/arm/mach-vexpress/ct-ca9x4.c
@@
-54,7
+54,9
@@
static struct map_desc ct_ca9x4_io_desc[] __initdata = {
static void __init ct_ca9x4_map_io(void)
{
+#ifdef CONFIG_LOCAL_TIMERS
twd_base = MMIO_P2V(A9_MPCORE_TWD);
+#endif
v2m_map_io(ct_ca9x4_io_desc, ARRAY_SIZE(ct_ca9x4_io_desc));
}