Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

[sfrench/cifs-2.6.git] / arch / arm / mach-omap2 / board-apollon.c

diff --git a/arch/arm/mach-omap2/board-apollon.c b/arch/arm/mach-omap2/board-apollon.c
index 3e2d76f05af4e4328ba9eb970ca8c118eff9e491..cea3abace815716b4fea93aa1e9aae1c61238740 100644 (file)
--- a/arch/arm/mach-omap2/board-apollon.c
+++ b/arch/arm/mach-omap2/board-apollon.c
@@ -202,7 +202,7 @@ static inline void __init apollon_init_smc91x(void)
                return;
        }
 
-       clk_enable(gpmc_fck);
+       clk_prepare_enable(gpmc_fck);
        rate = clk_get_rate(gpmc_fck);
 
        eth_cs = APOLLON_ETH_CS;
@@ -246,7 +246,7 @@ static inline void __init apollon_init_smc91x(void)
                gpmc_cs_free(APOLLON_ETH_CS);
        }
 out:
-       clk_disable(gpmc_fck);
+       clk_disable_unprepare(gpmc_fck);
        clk_put(gpmc_fck);
 }