diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-06-03 16:00:22 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-05 07:13:12 -0700 |
| commit | 37482f9cfb0269e082a817f31ad2a5f0204163f9 (patch) | |
| tree | b8d1eebb01bf019b364430ae0b253588db0e938e /arch/arm/mach-mxs | |
| parent | ddcca42fb47e59b1655d866b364c3dac4ba3f135 (diff) | |
ARM: mxs: stub out mxs_pm_init for !CONFIG_PM
commit 7a9caf59f60e55a8caf96f856713bd0ef0cc25a7 upstream.
When building a kernel without CONFIG_PM, we get a link
error from referencing mxs_pm_init in the machine
descriptor. This defines a macro to NULL for that case.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/mach-mxs')
| -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 |