diff options
| author | Gary Robertson <gary.robertson@linaro.org> | 2013-10-31 17:57:05 -0700 |
|---|---|---|
| committer | Gary Robertson <gary.robertson@linaro.org> | 2013-10-31 17:57:05 -0700 |
| commit | b7fbb07e1d6744e87079a12dc29f7c2fb8205c26 (patch) | |
| tree | e51ff461b46a470c81d62c6d86853187646624c3 /arch/arm/mach-mxs/pm.h | |
| parent | 4da2c19b694dd0e5932cee3eeb40df3e637628cc (diff) | |
| parent | cac65253a9c5a30d4c8d7bc4c60197935f9e2e70 (diff) | |
Merge tag 'v3.10.15' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-lnglinux-lng-v3.10.15-final
This is the 3.10.15 stable release
Diffstat (limited to 'arch/arm/mach-mxs/pm.h')
| -rw-r--r-- | arch/arm/mach-mxs/pm.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-mxs/pm.h b/arch/arm/mach-mxs/pm.h index f57e7cdece2e..09d77b00a96b 100644 --- a/arch/arm/mach-mxs/pm.h +++ b/arch/arm/mach-mxs/pm.h @@ -9,6 +9,10 @@ #ifndef __ARCH_MXS_PM_H #define __ARCH_MXS_PM_H +#ifdef CONFIG_PM void mxs_pm_init(void); +#else +#define mxs_pm_init NULL +#endif #endif |