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; }