diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-01-03 21:27:56 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-01-03 21:27:56 +0100 |
| commit | 038485ea9b66858c17f82e5393004532825106a7 (patch) | |
| tree | e411be1686e4ed73c4f74f0388410231d26e5c76 /arch/arm/plat-mxc/include/mach/common.h | |
| parent | Merge branch 'v3.2-rc7' into next/pm (diff) | |
| parent | Merge branch 'imx/pm' of git://git.linaro.org/people/shawnguo/linux-2.6 into ... (diff) | |
| download | linux-038485ea9b66858c17f82e5393004532825106a7.tar.xz linux-038485ea9b66858c17f82e5393004532825106a7.zip | |
Merge branch 'imx6/pm' into next/pm
* imx6/pm:
ARM: imx6q: resume PL310 only when CACHE_L2X0 defined
ARM: imx6q: build pm code only when CONFIG_PM selected
ARM: mx5: use generic irq chip pm interface for pm functions on
Diffstat (limited to 'arch/arm/plat-mxc/include/mach/common.h')
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/common.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/plat-mxc/include/mach/common.h b/arch/arm/plat-mxc/include/mach/common.h index 6698cae942f7..3846c53f5b5d 100644 --- a/arch/arm/plat-mxc/include/mach/common.h +++ b/arch/arm/plat-mxc/include/mach/common.h @@ -130,6 +130,12 @@ extern void imx53_evk_common_init(void); extern void imx53_qsb_common_init(void); extern void imx53_smd_common_init(void); extern int imx6q_set_lpm(enum mxc_cpu_pwr_mode mode); -extern void imx6q_pm_init(void); extern void imx6q_clock_map_io(void); + +#ifdef CONFIG_PM +extern void imx6q_pm_init(void); +#else +static inline void imx6q_pm_init(void) {} +#endif + #endif |