diff options
| author | Stefan Schmidt <stefan@datenfreihafen.org> | 2010-02-16 22:42:55 +0100 |
|---|---|---|
| committer | Eric Miao <eric.y.miao@gmail.com> | 2010-03-02 07:40:52 +0800 |
| commit | 98acdbe4cf83f5a2e21c7aac830146b5d6da9282 (patch) | |
| tree | d5200b21c99bd57d4e1464655e1605f11f6a4efe /arch/arm/mach-pxa/zeus.c | |
| parent | cfab57e0e44631b1369e05efa54031b993511c2f (diff) | |
| download | kernel_samsung_smdk4412-98acdbe4cf83f5a2e21c7aac830146b5d6da9282.zip kernel_samsung_smdk4412-98acdbe4cf83f5a2e21c7aac830146b5d6da9282.tar.gz kernel_samsung_smdk4412-98acdbe4cf83f5a2e21c7aac830146b5d6da9282.tar.bz2 | |
[ARM] pxa: define zeus_power_off() only when CONFIG_PM enabled
Add some safety check for CONFIG_PM around zeus_power_off(). Without
it linking can fail like this:
arch/arm/mach-pxa/built-in.o: In function `zeus_power_off':
e800.c:(.text+0x2bc8): undefined reference to `pxa27x_cpu_suspend'
Signed-off-by: Stefan Schmidt <stefan@datenfreihafen.org>
Acked-by: Marc Zyngier <maz@misterjones.org>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Diffstat (limited to 'arch/arm/mach-pxa/zeus.c')
| -rw-r--r-- | arch/arm/mach-pxa/zeus.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/zeus.c b/arch/arm/mach-pxa/zeus.c index 9c2ec77..765e618 100644 --- a/arch/arm/mach-pxa/zeus.c +++ b/arch/arm/mach-pxa/zeus.c @@ -621,11 +621,15 @@ static struct pxa2xx_udc_mach_info zeus_udc_info = { .udc_command = zeus_udc_command, }; +#ifdef CONFIG_PM static void zeus_power_off(void) { local_irq_disable(); pxa27x_cpu_suspend(PWRMODE_DEEPSLEEP); } +#else +#define zeus_power_off NULL +#endif #ifdef CONFIG_APM_EMULATION static void zeus_get_power_status(struct apm_power_info *info) |