diff options
author | 2008-01-02 08:24:49 +0800 | |
---|---|---|
committer | 2008-01-26 15:07:54 +0000 | |
commit | f79299ca85f6f8c8817bc38494f7caa0a7043c3b (patch) | |
tree | 07aafb1cc4cf5367de52800ea7e01b7c6238c38a /arch/arm/mach-pxa/pxa27x.c | |
parent | [ARM] pxa: move memory controller registers into pxa2xx-regs.h (diff) | |
download | linux-dev-f79299ca85f6f8c8817bc38494f7caa0a7043c3b.tar.xz linux-dev-f79299ca85f6f8c8817bc38494f7caa0a7043c3b.zip |
[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 '')
-rw-r--r-- | arch/arm/mach-pxa/pxa27x.c | 6 |
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) { 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; |