[PATCH 2/2] arm/pxa: Let zeus.c link without CONFIG_PM enabled.

Stefan Schmidt stefan at datenfreihafen.org
Tue Feb 16 16:42:55 EST 2010


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 at datenfreihafen.org>

--

This smells a bit fishy as zeus_power_off() is only mapped to pm_power_off and
that one seems to come and go to nowhere. Is this any magic I don't get on a
first glance?
---
 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 75f2a37..213279d 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)
-- 
1.6.6.2




More information about the linux-arm-kernel mailing list