Cleanup patch to sync with mainline kernel

[linux-2.6-omap-h63xx.git] / arch / arm / plat-omap / timer32k.c

diff --git a/arch/arm/plat-omap/timer32k.c b/arch/arm/plat-omap/timer32k.c
index 9e74ce5db058b3f33d1a9bb84fa3c80d0cb2bacf..b2a943bf11ef98f4a8eb5789102a9f968244de90 100644 (file)
--- a/arch/arm/plat-omap/timer32k.c
+++ b/arch/arm/plat-omap/timer32k.c
@@ -41,6 +41,7 @@
 #include <linux/sched.h>
 #include <linux/spinlock.h>
 #include <linux/err.h>
+#include <linux/clk.h>
 
 #include <asm/system.h>
 #include <asm/hardware.h>
@@ -49,7 +50,6 @@
 #include <asm/irq.h>
 #include <asm/mach/irq.h>
 #include <asm/mach/time.h>
-#include <asm/hardware/clock.h>
 
 struct sys_timer omap_timer;
 
@@ -272,7 +272,7 @@ static struct clk * gpt1_ick;
 static struct clk * gpt1_fck;
 
 static __init void omap_init_32k_timer(void)
-{      
+{
 #ifdef CONFIG_NO_IDLE_HZ
        omap_timer.dyn_tick = &omap_dyn_tick_timer;
 #endif
@@ -293,13 +293,13 @@ static __init void omap_init_32k_timer(void)
                if (IS_ERR(gpt1_ick))
                        printk(KERN_ERR "Could not get gpt1_ick\n");
                else
-                       clk_use(gpt1_ick);
+                       clk_enable(gpt1_ick);
 
                gpt1_fck = clk_get(NULL, "gpt1_fck");
                if (IS_ERR(gpt1_fck))
                        printk(KERN_ERR "Could not get gpt1_fck\n");
                else
-                       clk_use(gpt1_fck);
+                       clk_enable(gpt1_fck);
 
                mdelay(100);            /* Wait for clocks to stabilize */