From 9c2095d7546046cac0f25aa4fc015365045b770c Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Tue, 21 Mar 2006 23:20:27 -0800
Subject: [PATCH] --- yaml --- r: 22971 b: refs/heads/master c:
 57ae595f6bf8bde42de199ff9fe68b873080fde2 h: refs/heads/master i:   22969:
 a5226d3412813f0def44bc6ccf634f05e137e0d9   22967:
 5afd10eef30b4f5762a7fdb9b4117f8a6c9cb98e v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/macintosh/via-pmu.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 5ead014bfa39..b5843e2f3537 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3e52174ec8fd9d8671b69b8e7decb465aaf519c0
+refs/heads/master: 57ae595f6bf8bde42de199ff9fe68b873080fde2
diff --git a/trunk/drivers/macintosh/via-pmu.c b/trunk/drivers/macintosh/via-pmu.c
index 8a8fffa339f0..4f5f3abc9cb3 100644
--- a/trunk/drivers/macintosh/via-pmu.c
+++ b/trunk/drivers/macintosh/via-pmu.c
@@ -161,7 +161,9 @@ static int drop_interrupts;
 #if defined(CONFIG_PM) && defined(CONFIG_PPC32)
 static int option_lid_wakeup = 1;
 #endif /* CONFIG_PM && CONFIG_PPC32 */
+#if (defined(CONFIG_PM)&&defined(CONFIG_PPC32))||defined(CONFIG_PMAC_BACKLIGHT)
 static int sleep_in_progress;
+#endif
 static unsigned long async_req_locks;
 static unsigned int pmu_irq_stats[11];