Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-2.6] / arch / parisc / kernel / time.c

diff --git a/arch/parisc/kernel/time.c b/arch/parisc/kernel/time.c
index 9b14066d693c2264a93ae057fc2e69c75ffed605..24be86bba94d6bdf93618109bb490bf6fbe68205 100644 (file)
--- a/arch/parisc/kernel/time.c
+++ b/arch/parisc/kernel/time.c
@@ -189,16 +189,19 @@ static struct clocksource clocksource_cr16 = {
 #ifdef CONFIG_SMP
 int update_cr16_clocksource(void)
 {
-       int change = 0;
-
-       /* since the cr16 cycle counters are not syncronized across CPUs,
+       /* since the cr16 cycle counters are not synchronized across CPUs,
           we'll check if we should switch to a safe clocksource: */
        if (clocksource_cr16.rating != 0 && num_online_cpus() > 1) {
                clocksource_change_rating(&clocksource_cr16, 0);
-               change = 1;
+               return 1;
        }
 
-       return change;
+       return 0;
+}
+#else
+int update_cr16_clocksource(void)
+{
+       return 0; /* no change */
 }
 #endif /*CONFIG_SMP*/