diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-11 04:26:12 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-11 04:26:12 -0500 |
| commit | e3f4e1cbc341bc2020241d8119bd078db3ec3b85 (patch) | |
| tree | 8b23624cc792f60d0bf86d787c3514cf0fb04418 /arch/sparc | |
| parent | adfe67ddffbea51322b118896178bd71aaa4b4d8 (diff) | |
| parent | d71cb81af3817193bc605de061da0499934263a6 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'arch/sparc')
| -rw-r--r-- | arch/sparc/kernel/time_64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/time_64.c b/arch/sparc/kernel/time_64.c index da1218e8ee87..63f73ae8a892 100644 --- a/arch/sparc/kernel/time_64.c +++ b/arch/sparc/kernel/time_64.c | |||
| @@ -847,7 +847,7 @@ void __init time_init(void) | |||
| 847 | sparc64_clockevent.min_delta_ns = | 847 | sparc64_clockevent.min_delta_ns = |
| 848 | clockevent_delta2ns(0xF, &sparc64_clockevent); | 848 | clockevent_delta2ns(0xF, &sparc64_clockevent); |
| 849 | 849 | ||
| 850 | printk("clockevent: mult[%lx] shift[%d]\n", | 850 | printk("clockevent: mult[%ux] shift[%d]\n", |
| 851 | sparc64_clockevent.mult, sparc64_clockevent.shift); | 851 | sparc64_clockevent.mult, sparc64_clockevent.shift); |
| 852 | 852 | ||
| 853 | setup_sparc64_timer(); | 853 | setup_sparc64_timer(); |