3 files changed, 10 insertions, 7 deletions

diff --git a/arch/arm/mach-pxa/Makefile b/arch/arm/mach-pxa/Makefile
index db18c8de7d55..f7444c7a9227 100644
--- a/arch/arm/mach-pxa/Makefile
+++ b/arch/arm/mach-pxa/Makefile
@@ -41,14 +41,10 @@ led-$(CONFIG_MACH_TRIZEPS4)	+= leds-trizeps4.o
 obj-$(CONFIG_LEDS)              += $(led-y)
 
 # Misc features
-obj-$(CONFIG_PM)                += pm.o sleep.o
+obj-$(CONFIG_PM)                += pm.o sleep.o standby.o
 obj-$(CONFIG_CPU_FREQ)          += cpu-pxa.o
 obj-$(CONFIG_PXA_SSP)           += ssp.o
 
-ifeq ($(CONFIG_PXA27x),y)
-obj-$(CONFIG_PM)                += standby.o
-endif
-
 ifeq ($(CONFIG_PCI),y)
 obj-$(CONFIG_MACH_ARMCORE) += cm-x270-pci.o
 endif
diff --git a/arch/arm/mach-pxa/sleep.S b/arch/arm/mach-pxa/sleep.S
index f33d0c4a96d6..14bb4a93ea52 100644
--- a/arch/arm/mach-pxa/sleep.S
+++ b/arch/arm/mach-pxa/sleep.S
@@ -50,6 +50,7 @@ pxa_cpu_save_sp:
         str     r0, [r1]
         ldr     pc, [sp], #4
 
+#ifdef CONFIG_PXA27x
 /*
  * pxa27x_cpu_suspend()
  *
@@ -105,9 +106,11 @@ ENTRY(pxa27x_cpu_suspend)
 
         @ align execution to a cache line
         b       pxa_cpu_do_suspend
+#endif
 
+#ifdef CONFIG_PXA25x
 /*
- * pxa27x_cpu_suspend()
+ * pxa25x_cpu_suspend()
  *
  * Forces CPU into sleep state.
  *
@@ -170,6 +173,7 @@ ENTRY(pxa25x_cpu_suspend)
         mcr     p14, 0, r0, c6, c0, 0
         orr     r0, r0, #2                      @ initiate change bit
         b       pxa_cpu_do_suspend
+#endif
 
         .ltorg
         .align  5
@@ -209,7 +213,7 @@ pxa_cpu_do_suspend:
 20:     b       20b                             @ loop waiting for sleep
 
 /*
- * cpu_pxa_resume()
+ * pxa_cpu_resume()
  *
  * entry point from bootloader into kernel during resume
  *
diff --git a/arch/arm/mach-pxa/standby.S b/arch/arm/mach-pxa/standby.S
index d774430d02c0..434a6ab0eca5 100644
--- a/arch/arm/mach-pxa/standby.S
+++ b/arch/arm/mach-pxa/standby.S
@@ -17,6 +17,7 @@
 
                 .text
 
+#ifdef CONFIG_PXA27x
 ENTRY(pxa_cpu_standby)
         ldr     r0, =PSSR
         mov     r1, #(PSSR_PH | PSSR_STS)
@@ -29,3 +30,5 @@ ENTRY(pxa_cpu_standby)
 1:      mcr     p14, 0, r2, c7, c0, 0   @ put the system into Standby
         str     r1, [r0]                @ make sure PSSR_PH/STS are clear
         mov     pc, lr
+
+#endif