From 03ed2ea4864ad79d15bfc77a3f4100334e71d892 Mon Sep 17 00:00:00 2001
From: Will Deacon <will.deacon@arm.com>
Date: Wed, 10 Nov 2010 15:59:11 +0100
Subject: [PATCH] --- yaml --- r: 221882 b: refs/heads/master c:
 e56c010f0d08bbecd05074eded7805d555da29b6 h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/arm/mach-vexpress/ct-ca9x4.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c1fccddf0309..57b4123310e0 100644
--- 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
index c2e405a9e025..fd25ccd7272f 100644
--- 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));
 }