Merge git://github.com/rustyrussell/linux

[pandora-kernel.git] / arch / arm / mach-prima2 / timer.c

diff --git a/arch/arm/mach-prima2/timer.c b/arch/arm/mach-prima2/timer.c
index 3b15961..b7a6091 100644 (file)
--- a/arch/arm/mach-prima2/timer.c
+++ b/arch/arm/mach-prima2/timer.c
@@ -167,14 +167,14 @@ static struct irqaction sirfsoc_timer_irq = {
 /* Overwrite weak default sched_clock with more precise one */
 unsigned long long notrace sched_clock(void)
 {
-       static int is_mapped = 0;
+       static int is_mapped;
 
        /*
         * sched_clock is called earlier than .init of sys_timer
         * 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;
        }