aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/pxa27x.c
diff options
context:
space:
mode:
authoreric miao <eric.miao@marvell.com>2008-01-01 19:24:49 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-01-26 10:07:54 -0500
commitf79299ca85f6f8c8817bc38494f7caa0a7043c3b (patch)
tree07aafb1cc4cf5367de52800ea7e01b7c6238c38a /arch/arm/mach-pxa/pxa27x.c
parent8785a8fbd5a1624dbabd7c782524450e902b722e (diff)
[ARM] pxa: clean up pxa{27x,25x}_init_pm() to empty if CONFIG_PM not defined
Signed-off-by: eric miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-pxa/pxa27x.c')
-rw-r--r--arch/arm/mach-pxa/pxa27x.c6
1 files changed, 4 insertions, 2 deletions
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)
306{ 306{
307 pxa_cpu_pm_fns = &pxa27x_cpu_pm_fns; 307 pxa_cpu_pm_fns = &pxa27x_cpu_pm_fns;
308} 308}
309#else
310static inline void pxa27x_init_pm(void) {}
309#endif 311#endif
310 312
311/* PXA27x: Various gpios can issue wakeup events. This logic only 313/* PXA27x: Various gpios can issue wakeup events. This logic only
@@ -415,9 +417,9 @@ static int __init pxa27x_init(void)
415 417
416 if ((ret = pxa_init_dma(32))) 418 if ((ret = pxa_init_dma(32)))
417 return ret; 419 return ret;
418#ifdef CONFIG_PM 420
419 pxa27x_init_pm(); 421 pxa27x_init_pm();
420#endif 422
421 ret = platform_add_devices(devices, ARRAY_SIZE(devices)); 423 ret = platform_add_devices(devices, ARRAY_SIZE(devices));
422 } 424 }
423 return ret; 425 return ret;