From: Arnd Bergmann Date: Mon, 3 Jun 2013 14:00:22 +0000 (+0200) Subject: ARM: mxs: stub out mxs_pm_init for !CONFIG_PM X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7a9caf59f60e55a8caf96f856713bd0ef0cc25a7;p=linux-beck.git ARM: mxs: stub out mxs_pm_init for !CONFIG_PM 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 Acked-by: Shawn Guo --- 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