[PATCH] Always define pmu_sys_suspended

Guido Günther agx at sigxcpu.org
Thu Feb 28 01:14:52 EST 2008


In current Linus git pmu_sys_suspended is only defined if
CONFIG_SUSPEND is set, so compilation fails with:

drivers/built-in.o: In function `pmu_led_set':
via-pmu-led.c:(.text+0x48622): undefined reference to `pmu_sys_suspended'
via-pmu-led.c:(.text+0x48626): undefined reference to `pmu_sys_suspended'
drivers/built-in.o: In function `pmu_req_done':
via-pmu-led.c:(.text+0x48696): undefined reference to `pmu_sys_suspended'
via-pmu-led.c:(.text+0x4869a): undefined reference to `pmu_sys_suspended'
make: *** [.tmp_vmlinux1] Error 1

since via-pmu-led.c uses it unconditionally. Instead of adding more '#ifdef'
clutter I moved it out of the #ifdef so it's always available. Need to fix
compilation on PPC32 without CONFIG_SUSPEND.

Signed-off-by: Guido Guenther <agx at sigxcpu.org>
---
 drivers/macintosh/via-pmu.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c
index ebec663..296edcb 100644
--- a/drivers/macintosh/via-pmu.c
+++ b/drivers/macintosh/via-pmu.c
@@ -2437,8 +2437,8 @@ void pmu_blink(int n)
 }
 #endif /* DEBUG_SLEEP */
 
-#if defined(CONFIG_SUSPEND) && defined(CONFIG_PPC32)
 int pmu_sys_suspended;
+#if defined(CONFIG_SUSPEND) && defined(CONFIG_PPC32)
 
 static int pmu_sys_suspend(struct sys_device *sysdev, pm_message_t state)
 {
-- 
1.5.4.2




More information about the Linuxppc-dev mailing list