Merge branch 'akpm' (updates from Andrew Morton)

[karo-tx-linux.git] / arch / arm / mach-mxs / pm.h

diff --git a/arch/arm/mach-mxs/pm.h b/arch/arm/mach-mxs/pm.h
index f57e7cdece2e809db4eeada2ba146009cd2df3e0..09d77b00a96b7f27f6088b3f579bf8c4fc4a6292 100644 (file)
--- 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