From: Rafael J. Wysocki <rjw@sisk.pl>
Date: Sat, 8 Dec 2007 01:03:26 +0000 (+0100)
Subject: Suspend: Fix compilation warning for CONFIG_SUSPEND unset
X-Git-Tag: v2.6.25-rc1~1073^2~23
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=2ed43b63285c394cb5e1829c199cc94c7b8233b9;p=linux-2.6-omap-h63xx.git

Suspend: Fix compilation warning for CONFIG_SUSPEND unset

Suspend: Make debug facility depend on CONFIG_SUSPEND

Make the new suspend debug facility code depend on CONFIG_SUSPEND,
as appropriate, to remove the compiler warning printed when CONFIG_PM is set
and CONFIG_SUSPEND is not set.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Len Brown <len.brown@intel.com>
---

diff --git a/kernel/power/main.c b/kernel/power/main.c
index 0a9f269075e..7fb805de19a 100644
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -55,6 +55,8 @@ int pm_notifier_call_chain(unsigned long val)
 
 #endif /* CONFIG_PM_SLEEP */
 
+#ifdef CONFIG_SUSPEND
+
 #ifdef CONFIG_PM_DEBUG
 int pm_test_level = TEST_NONE;