ARM: OMAP: remove plat/clock.h

[cascardo/linux.git] / arch / arm / mach-omap2 / clkt2xxx_apll.c

diff --git a/arch/arm/mach-omap2/clkt2xxx_apll.c b/arch/arm/mach-omap2/clkt2xxx_apll.c
index b19a1f7..73a1414 100644 (file)
--- a/arch/arm/mach-omap2/clkt2xxx_apll.c
+++ b/arch/arm/mach-omap2/clkt2xxx_apll.c
@@ -21,7 +21,6 @@
 #include <linux/clk.h>
 #include <linux/io.h>
 
-#include <plat/clock.h>
 #include <plat/prcm.h>
 
 #include "clock.h"
@@ -59,7 +58,7 @@ static int omap2_clk_apll_enable(struct clk *clk, u32 status_mask)
        omap2_cm_write_mod_reg(cval, PLL_MOD, CM_CLKEN);
 
        omap2_cm_wait_idlest(cm_idlest_pll, status_mask,
-                            OMAP24XX_CM_IDLEST_VAL, clk->name);
+                            OMAP24XX_CM_IDLEST_VAL, __clk_get_name(clk));
 
        /*
         * REVISIT: Should we return an error code if omap2_wait_clock_ready()