diff options
| author | John Stultz <johnstul@us.ibm.com> | 2010-10-19 17:58:48 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2011-11-21 19:01:05 -0800 |
| commit | 027f6ad7bfa97cf8f75e9d81c15256d828eb0809 (patch) | |
| tree | 3db3a3a7eea1c57368c84044b25fe04a72e2d186 /arch/cris | |
| parent | a139723bec122053a94c80596c8b991b860ffb91 (diff) | |
clocksource: cris: Convert to clocksource_register_khz
This converts the cris architecture to use clocksource_register_khz
This is untested, so any help from maintainers would be appreciated.
CC: Mikael Starvik <starvik@axis.com>
CC: Jesper Nilsson <jesper.nilsson@axis.com>
CC: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: John Stultz <johnstul@us.ibm.com>
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); |