]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
[ARM] pxa: define zeus_power_off() only when CONFIG_PM enabled
authorStefan Schmidt <stefan@datenfreihafen.org>
Tue, 16 Feb 2010 21:42:55 +0000 (22:42 +0100)
committerEric Miao <eric.y.miao@gmail.com>
Mon, 1 Mar 2010 23:40:52 +0000 (07:40 +0800)
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>
arch/arm/mach-pxa/zeus.c

index 9c2ec776f601e82336f560c06f0b02543d3f9394..765e6189f7baab75bcb5b381b6e157894089102d 100644 (file)
@@ -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)