提交 a8fa3f0c 编写于 作者: N Nicolas Pitre 提交者: Russell King

[PATCH] ARM: 2711/1: fix compilation on PXA targets with CONFIG_PM=n

Patch from Nicolas Pitre

Signed-off-by: Nicolas Pitre
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>
上级 c0105338
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
* initialization stuff for PXA machines which can be overridden later if * initialization stuff for PXA machines which can be overridden later if
* need be. * need be.
*/ */
#include <linux/config.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/init.h> #include <linux/init.h>
...@@ -103,6 +104,7 @@ unsigned int get_lcdclk_frequency_10khz(void) ...@@ -103,6 +104,7 @@ unsigned int get_lcdclk_frequency_10khz(void)
EXPORT_SYMBOL(get_lcdclk_frequency_10khz); EXPORT_SYMBOL(get_lcdclk_frequency_10khz);
#ifdef CONFIG_PM
int pxa_cpu_pm_prepare(suspend_state_t state) int pxa_cpu_pm_prepare(suspend_state_t state)
{ {
...@@ -131,3 +133,5 @@ void pxa_cpu_pm_enter(suspend_state_t state) ...@@ -131,3 +133,5 @@ void pxa_cpu_pm_enter(suspend_state_t state)
break; break;
} }
} }
#endif
...@@ -120,6 +120,8 @@ EXPORT_SYMBOL(get_clk_frequency_khz); ...@@ -120,6 +120,8 @@ EXPORT_SYMBOL(get_clk_frequency_khz);
EXPORT_SYMBOL(get_memclk_frequency_10khz); EXPORT_SYMBOL(get_memclk_frequency_10khz);
EXPORT_SYMBOL(get_lcdclk_frequency_10khz); EXPORT_SYMBOL(get_lcdclk_frequency_10khz);
#ifdef CONFIG_PM
int pxa_cpu_pm_prepare(suspend_state_t state) int pxa_cpu_pm_prepare(suspend_state_t state)
{ {
switch (state) { switch (state) {
...@@ -153,6 +155,8 @@ void pxa_cpu_pm_enter(suspend_state_t state) ...@@ -153,6 +155,8 @@ void pxa_cpu_pm_enter(suspend_state_t state)
} }
} }
#endif
/* /*
* device registration specific to PXA27x. * device registration specific to PXA27x.
*/ */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册