Merge branch 'stericsson/fixes' into next/cleanup

[karo-tx-linux.git] / arch / arm / mach-prima2 / timer.c

diff --git a/arch/arm/mach-prima2/timer.c b/arch/arm/mach-prima2/timer.c
index 44027f34a88aadfc066945ef686c8f9530fc9e4c..26ab6fee56190b5fba9af3638f73f3374490a010 100644 (file)
--- a/arch/arm/mach-prima2/timer.c
+++ b/arch/arm/mach-prima2/timer.c
@@ -133,14 +133,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;
        }
@@ -190,6 +190,7 @@ static void __init sirfsoc_timer_init(void)
 
 static struct of_device_id timer_ids[] = {
        { .compatible = "sirf,prima2-tick" },
+       {},
 };
 
 static void __init sirfsoc_of_timer_map(void)