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

[sfrench/cifs-2.6.git] / arch / sparc / kernel / time_64.c

diff --git a/arch/sparc/kernel/time_64.c b/arch/sparc/kernel/time_64.c
index da1218e8ee87a2beea896d93ec67401922623450..63f73ae8a892fd89525b2465a7f964fb9b34d9ea 100644 (file)
--- a/arch/sparc/kernel/time_64.c
+++ b/arch/sparc/kernel/time_64.c
@@ -847,7 +847,7 @@ void __init time_init(void)
        sparc64_clockevent.min_delta_ns =
                clockevent_delta2ns(0xF, &sparc64_clockevent);
 
-       printk("clockevent: mult[%lx] shift[%d]\n",
+       printk("clockevent: mult[%ux] shift[%d]\n",
               sparc64_clockevent.mult, sparc64_clockevent.shift);
 
        setup_sparc64_timer();