git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
[pandora-kernel.git]
/
arch
/
mips
/
jz4740
/
time.c
diff --git
a/arch/mips/jz4740/time.c
b/arch/mips/jz4740/time.c
index
eaa853a
..
f83c2dd
100644
(file)
--- a/
arch/mips/jz4740/time.c
+++ b/
arch/mips/jz4740/time.c
@@
-121,8
+121,7
@@
void __init plat_time_init(void)
clockevents_register_device(&jz4740_clockevent);
clockevents_register_device(&jz4740_clockevent);
- clocksource_set_clock(&jz4740_clocksource, clk_rate);
- ret = clocksource_register(&jz4740_clocksource);
+ ret = clocksource_register_hz(&jz4740_clocksource, clk_rate);
if (ret)
printk(KERN_ERR "Failed to register clocksource: %d\n", ret);
if (ret)
printk(KERN_ERR "Failed to register clocksource: %d\n", ret);