2 files changed, 8 insertions, 4 deletions

diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c
index c6ea0ed69270..962cfbb5500e 100644
--- a/arch/arm/mach-pxa/pxa25x.c
+++ b/arch/arm/mach-pxa/pxa25x.c
@@ -239,6 +239,8 @@ static void __init pxa25x_init_pm(void)
 {
         pxa_cpu_pm_fns = &pxa25x_cpu_pm_fns;
 }
+#else
+static inline void pxa25x_init_pm(void) {}
 #endif
 
 /* PXA25x: supports wakeup from GPIO0..GPIO15 and RTC alarm
@@ -310,9 +312,9 @@ static int __init pxa25x_init(void)
 
                 if ((ret = pxa_init_dma(16)))
                         return ret;
-#ifdef CONFIG_PM
+
                 pxa25x_init_pm();
-#endif
+
                 ret = platform_add_devices(pxa25x_devices,
                                            ARRAY_SIZE(pxa25x_devices));
         }
diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c
index b9fa5ec0a954..f33c9d7ff87e 100644
--- a/arch/arm/mach-pxa/pxa27x.c
+++ b/arch/arm/mach-pxa/pxa27x.c
@@ -306,6 +306,8 @@ static void __init pxa27x_init_pm(void)
 {
         pxa_cpu_pm_fns = &pxa27x_cpu_pm_fns;
 }
+#else
+static inline void pxa27x_init_pm(void) {}
 #endif
 
 /* PXA27x:  Various gpios can issue wakeup events.  This logic only
@@ -415,9 +417,9 @@ static int __init pxa27x_init(void)
 
                 if ((ret = pxa_init_dma(32)))
                         return ret;
-#ifdef CONFIG_PM
+
                 pxa27x_init_pm();
-#endif
+
                 ret = platform_add_devices(devices, ARRAY_SIZE(devices));
         }
         return ret;