From 83d74b3963fad0047e6b9990eafaa3e41abf75f6 Mon Sep 17 00:00:00 2001
From: Barry Song <Baohua.Song@csr.com>
Date: Thu, 22 Sep 2011 22:51:29 -0700
Subject: [PATCH] --- yaml --- r: 272625 b: refs/heads/master c:
 c6b96c54130f34840bb482d8d2c851da74259c2a h: refs/heads/master i:   272623:
 23c2eb0805cd33693ea9e40e98d8ef0f193c2d61 v: v3

---
 [refs]                             | 2 +-
 trunk/arch/arm/mach-prima2/timer.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index bf24c2cb5b9c..8f9afe602f8b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f70fc57e52fcd6c063eb378c0c370817cf00659e
+refs/heads/master: c6b96c54130f34840bb482d8d2c851da74259c2a
diff --git a/trunk/arch/arm/mach-prima2/timer.c b/trunk/arch/arm/mach-prima2/timer.c
index 225ed3b8cee3..26ab6fee5619 100644
--- a/trunk/arch/arm/mach-prima2/timer.c
+++ b/trunk/arch/arm/mach-prima2/timer.c
@@ -140,7 +140,7 @@ unsigned long long notrace sched_clock(void)
 	 * if we map timer memory in .init of sys_timer, system
 	 * will panic due to illegal memory access
 	 */
-	if(!is_mapped) {
+	if (!is_mapped) {
 		sirfsoc_of_timer_map();
 		is_mapped = 1;
 	}