diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-01-03 20:36:08 +0000 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-01-03 20:36:08 +0000 |
commit | 8c3b2296f1aa13d7504d2c09bc819cef3759562a (patch) | |
tree | ab97efb5785f77ed83292c97ba9e5909cfee8fba /arch/arm/kernel/suspend.c | |
parent | 5f0a6e2d503896062f641639dacfe5055c2f593b (diff) | |
parent | e1482a1708e48add8d2f4ecc949885e0e552d9e8 (diff) |
Merge branch 'imx/clk' into next/clk
* imx/clk:
ARM: mxs: select HAVE_CLK_PREPARE for clock
clk: add config option HAVE_CLK_PREPARE into Kconfig
ASoC: mxs-saif: convert to clk_prepare/clk_unprepare
video: mxsfb: convert to clk_prepare/clk_unprepare
serial: mxs-auart: convert to clk_prepare/clk_unprepare
net: flexcan: convert to clk_prepare/clk_unprepare
mtd: gpmi-lib: convert to clk_prepare/clk_unprepare
mmc: mxs-mmc: convert to clk_prepare/clk_unprepare
dma: mxs-dma: convert to clk_prepare/clk_unprepare
net: fec: add clk_prepare/clk_unprepare
ARM: mxs: convert platform code to clk_prepare/clk_unprepare
clk: add helper functions clk_prepare_enable and clk_disable_unprepare
Diffstat (limited to 'arch/arm/kernel/suspend.c')
0 files changed, 0 insertions, 0 deletions