summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-13 14:47:47 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-13 14:47:47 -0700
commit386bfcf5e8a3c34d92156c945c8db58a1e2f7c69 (patch)
treec62e56731b3740a1962af91c261de7c2a0d3bbcc
parent980802e311088fda56c16650589faa4597c695fb (diff)
parenta8fa3f0c59f8a1e1d89542cff0be5b057b684653 (diff)
Merge master.kernel.org:/home/rmk/linux-2.6-arm
-rw-r--r--arch/arm/mach-pxa/pxa25x.c4
-rw-r--r--arch/arm/mach-pxa/pxa27x.c4
2 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c
index b6d945a6e774..7869c3b4e62f 100644
--- a/arch/arm/mach-pxa/pxa25x.c
+++ b/arch/arm/mach-pxa/pxa25x.c
@@ -16,6 +16,7 @@
* initialization stuff for PXA machines which can be overridden later if
* need be.
*/
+#include <linux/config.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/init.h>
@@ -103,6 +104,7 @@ unsigned int get_lcdclk_frequency_10khz(void)
EXPORT_SYMBOL(get_lcdclk_frequency_10khz);
+#ifdef CONFIG_PM
int pxa_cpu_pm_prepare(suspend_state_t state)
{
@@ -131,3 +133,5 @@ void pxa_cpu_pm_enter(suspend_state_t state)
break;
}
}
+
+#endif
diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c
index aa3c3b2ab75e..893964fb9659 100644
--- a/arch/arm/mach-pxa/pxa27x.c
+++ b/arch/arm/mach-pxa/pxa27x.c
@@ -120,6 +120,8 @@ EXPORT_SYMBOL(get_clk_frequency_khz);
EXPORT_SYMBOL(get_memclk_frequency_10khz);
EXPORT_SYMBOL(get_lcdclk_frequency_10khz);
+#ifdef CONFIG_PM
+
int pxa_cpu_pm_prepare(suspend_state_t state)
{
switch (state) {
@@ -153,6 +155,8 @@ void pxa_cpu_pm_enter(suspend_state_t state)
}
}
+#endif
+
/*
* device registration specific to PXA27x.
*/