aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-mxs
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2013-06-03 16:00:22 +0200
committerArnd Bergmann <arnd@arndb.de>2013-06-24 16:03:13 +0200
commit7a9caf59f60e55a8caf96f856713bd0ef0cc25a7 (patch)
treed8d36a4dc33e712fad5c8bc2eafafa03aa48656a /arch/arm/mach-mxs
parent6eed846fc2dea75e945141f6ea806823fb66a278 (diff)
downloadlinux-linaro-stable-7a9caf59f60e55a8caf96f856713bd0ef0cc25a7.tar.gz
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 <arnd@arndb.de> Acked-by: Shawn Guo <shawn.guo@linaro.org>
Diffstat (limited to 'arch/arm/mach-mxs')
-rw-r--r--arch/arm/mach-mxs/pm.h4
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