diff options
| author | Olof Johansson <olof@lixom.net> | 2012-02-08 18:32:04 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-02-08 18:32:04 -0500 |
| commit | ac819a86a76dc29d18306f5c998c38af1ebb58cd (patch) | |
| tree | c1d5b4280897edebdf8954b4290b26b105110c84 /arch/arm/plat-mxc/system.c | |
| parent | 0180a7d012e413a956e3f46fcbeb8dbf3374a19c (diff) | |
| parent | 5ef97faa31ccf34d6fef0964aea3c924f9d534fe (diff) | |
Merge branch 'features/imx-clk-prepare' of git://git.pengutronix.de/git/imx/linux-2.6 into next/drivers
* 'features/imx-clk-prepare' of git://git.pengutronix.de/git/imx/linux-2.6:
mmc: sdhci-esdhc-imx: add clk_prepare/clk_unprepare
i2c: imx: add clk_prepare/clk_unprepare
serial: imx: add clk_prepare/clk_unprepare
ARM: mx31moboard: add clk_prepare/clk_unprepare
ARM: pm-imx5: add clk_prepare/clk_unprepare
ARM: mxc: audmux-v2: add clk_prepare/clk_unprepare
ARM: mxc: arch_reset: add clk_prepare/clk_unprepare
ARM: mxc: epit: add clk_prepare/clk_unprepare
ARM: mxc: pwm: add clk_prepare/clk_unprepare
ARM: mxc: ahci: add clk_prepare/clk_unprepare
ARM: mxc: time: add clk_prepare/clk_unprepare
Diffstat (limited to 'arch/arm/plat-mxc/system.c')
| -rw-r--r-- | arch/arm/plat-mxc/system.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-mxc/system.c b/arch/arm/plat-mxc/system.c index 3599bf2cfd4f..f30dcacbbd0a 100644 --- 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) | |||
| 48 | 48 | ||
| 49 | clk = clk_get_sys("imx2-wdt.0", NULL); | 49 | clk = clk_get_sys("imx2-wdt.0", NULL); |
| 50 | if (!IS_ERR(clk)) | 50 | if (!IS_ERR(clk)) |
| 51 | clk_enable(clk); | 51 | clk_prepare_enable(clk); |
| 52 | wcr_enable = (1 << 2); | 52 | wcr_enable = (1 << 2); |
| 53 | } | 53 | } |
| 54 | 54 | ||