diff options
author | eric miao <eric.miao@marvell.com> | 2008-01-01 19:24:49 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-01-26 10:07:54 -0500 |
commit | f79299ca85f6f8c8817bc38494f7caa0a7043c3b (patch) | |
tree | 07aafb1cc4cf5367de52800ea7e01b7c6238c38a /arch/arm/mach-pxa/pxa25x.c | |
parent | 8785a8fbd5a1624dbabd7c782524450e902b722e (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/pxa25x.c')
-rw-r--r-- | arch/arm/mach-pxa/pxa25x.c | 6 |
1 files changed, 4 insertions, 2 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) | |||
239 | { | 239 | { |
240 | pxa_cpu_pm_fns = &pxa25x_cpu_pm_fns; | 240 | pxa_cpu_pm_fns = &pxa25x_cpu_pm_fns; |
241 | } | 241 | } |
242 | #else | ||
243 | static inline void pxa25x_init_pm(void) {} | ||
242 | #endif | 244 | #endif |
243 | 245 | ||
244 | /* PXA25x: supports wakeup from GPIO0..GPIO15 and RTC alarm | 246 | /* PXA25x: supports wakeup from GPIO0..GPIO15 and RTC alarm |
@@ -310,9 +312,9 @@ static int __init pxa25x_init(void) | |||
310 | 312 | ||
311 | if ((ret = pxa_init_dma(16))) | 313 | if ((ret = pxa_init_dma(16))) |
312 | return ret; | 314 | return ret; |
313 | #ifdef CONFIG_PM | 315 | |
314 | pxa25x_init_pm(); | 316 | pxa25x_init_pm(); |
315 | #endif | 317 | |
316 | ret = platform_add_devices(pxa25x_devices, | 318 | ret = platform_add_devices(pxa25x_devices, |
317 | ARRAY_SIZE(pxa25x_devices)); | 319 | ARRAY_SIZE(pxa25x_devices)); |
318 | } | 320 | } |