summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap2/timer-gp.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-01-18 15:18:53 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-18 15:18:53 -0800
commit2333f2120759bb2a3edcc0d32b2f310048ee610d (patch)
tree9dfd3df0d0702c45fbfdff00f5b5038de01301c5 /arch/arm/mach-omap2/timer-gp.c
parent097916ecafd3bbedbde3ba068522093bf72319b3 (diff)
parent37b797b270a81248f839629ddeb382a35c7b0d30 (diff)
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/mach-omap2/timer-gp.c')
-rw-r--r--arch/arm/mach-omap2/timer-gp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/timer-gp.c b/arch/arm/mach-omap2/timer-gp.c
index 23d36b1c40f..1d2f5ac2f69 100644
--- a/arch/arm/mach-omap2/timer-gp.c
+++ b/arch/arm/mach-omap2/timer-gp.c
@@ -104,7 +104,7 @@ static void __init omap2_gp_timer_init(void)
if (IS_ERR(sys_ck))
printk(KERN_ERR "Could not get sys_ck\n");
else {
- clk_use(sys_ck);
+ clk_enable(sys_ck);
tick_period = clk_get_rate(sys_ck) / 100;
clk_put(sys_ck);
}