From: Arnd Bergmann <arnd@xxxxxxxx> 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. Upstream commit: 7a9caf59f60e55a8caf96f856713bd0ef0cc25a7 From: Arnd Bergmann <arnd@xxxxxxxx> Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx> Cc: Shawn Guo <shawn.guo@xxxxxxxxxx> Acked-by: Shawn Guo <shawn.guo@xxxxxxxxxx> Cc: stable@xxxxxxxxxxxxxxx diff --git a/arch/arm/mach-mxs/pm.h b/arch/arm/mach-mxs/pm.h index f57e7cd..09d77b0 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 -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html