lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Browse Source
This commit is contained in:
David S. Miller
2009-12-11 01:26:12 -08:00
parent adfe67ddff d71cb81af3
commit e3f4e1cbc3
1712 changed files with 79737 additions and 33900 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/sparc/kernel/time_64.c
View File

@@ -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();