diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-19 17:44:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-19 17:44:13 -0700 |
| commit | 0f1bdc1815c4cb29b3cd71a7091b478e426faa0b (patch) | |
| tree | b4d70c6a305d91bf7d1c8a6bbf87508587d55633 /arch/mips/jz4740 | |
| parent | 80fe02b5daf176f99d3afc8f6c9dc9dece019836 (diff) | |
| parent | a18f22a968de17b29f2310cdb7ba69163e65ec15 (diff) | |
| download | blackbird-op-linux-0f1bdc1815c4cb29b3cd71a7091b478e426faa0b.tar.gz blackbird-op-linux-0f1bdc1815c4cb29b3cd71a7091b478e426faa0b.zip | |
Merge branch 'timers-clocksource-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers-clocksource-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
clocksource: convert mips to generic i8253 clocksource
clocksource: convert x86 to generic i8253 clocksource
clocksource: convert footbridge to generic i8253 clocksource
clocksource: add common i8253 PIT clocksource
blackfin: convert to clocksource_register_hz
mips: convert to clocksource_register_hz/khz
sparc: convert to clocksource_register_hz/khz
alpha: convert to clocksource_register_hz
microblaze: convert to clocksource_register_hz/khz
ia64: convert to clocksource_register_hz/khz
x86: Convert remaining x86 clocksources to clocksource_register_hz/khz
Make clocksource name const
Diffstat (limited to 'arch/mips/jz4740')
| -rw-r--r-- | arch/mips/jz4740/time.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/mips/jz4740/time.c b/arch/mips/jz4740/time.c index eaa853a54af6..f83c2dd07a27 100644 --- 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); - 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); |
