Merge tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub/scm...

[linux-2.6.git] / arch / arm / plat-mxc / system.c

diff --git a/arch/arm/plat-mxc/system.c b/arch/arm/plat-mxc/system.c
index c195d6d04d14f261a4c2be4a89f48bb20510c578..1996c3e3b8fe632ee51c12ba2e528b435007d4a7 100644 (file)
--- a/arch/arm/plat-mxc/system.c
+++ b/arch/arm/plat-mxc/system.c
@@ -48,7 +48,7 @@ void mxc_restart(char mode, const char *cmd)
 
                clk = clk_get_sys("imx2-wdt.0", NULL);
                if (!IS_ERR(clk))
-                       clk_enable(clk);
+                       clk_prepare_enable(clk);
                wcr_enable = (1 << 2);
        }