projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6eed846
)
ARM: mxs: stub out mxs_pm_init for !CONFIG_PM
author
Arnd Bergmann
<arnd@arndb.de>
Mon, 3 Jun 2013 14:00:22 +0000
(16:00 +0200)
committer
Arnd Bergmann
<arnd@arndb.de>
Mon, 24 Jun 2013 14:03:13 +0000
(16:03 +0200)
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>
arch/arm/mach-mxs/pm.h
patch
|
blob
|
history
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