diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2011-12-05 22:13:49 +0100 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2011-12-05 22:13:49 +0100 |
commit | 0518469d0a32be1e6dd8850ff274d52d72cdb52d (patch) | |
tree | c13038d099e04208feae565947783cf92ceae9ee /arch/cris | |
parent | 28a00184be261e3dc152ba0d664a067bbe235b6a (diff) | |
parent | f5a54dd7952e9032785cd1ef0dde72cd61025341 (diff) |
Merge branch 'fortglx/3.3/tip/timers/core' of git://git.linaro.org/people/jstultz/linux into timers/core
Diffstat (limited to 'arch/cris')
-rw-r--r-- | arch/cris/arch-v32/kernel/time.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/cris/arch-v32/kernel/time.c b/arch/cris/arch-v32/kernel/time.c index bb978ede8985..6773fc83a670 100644 --- a/arch/cris/arch-v32/kernel/time.c +++ b/arch/cris/arch-v32/kernel/time.c @@ -47,14 +47,12 @@ static struct clocksource cont_rotime = { .rating = 300, .read = read_cont_rotime, .mask = CLOCKSOURCE_MASK(32), - .shift = 10, .flags = CLOCK_SOURCE_IS_CONTINUOUS, }; static int __init etrax_init_cont_rotime(void) { - cont_rotime.mult = clocksource_khz2mult(100000, cont_rotime.shift); - clocksource_register(&cont_rotime); + clocksource_register_khz(&cont_rotime, 100000); return 0; } arch_initcall(etrax_init_cont_rotime); |