---

yaml --- r: 221882 b: refs/heads/master c: e56c010 h: refs/heads/master v: v3
git-mirror · Nov 10, 2010 · 03ed2ea · 03ed2ea
1 parent 8161e9b
commit 03ed2ea
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 69448c2a4d23e5883cbca21a173e3eb89f095746
+refs/heads/master: e56c010f0d08bbecd05074eded7805d555da29b6
diff --git a/trunk/arch/arm/mach-vexpress/ct-ca9x4.c b/trunk/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));
 }