From d177600d347e763a8ec18220b3eea49f13040294 Mon Sep 17 00:00:00 2001
From: Dave Jones <davej@redhat.com>
Date: Sun, 8 Jan 2006 01:05:09 -0800
Subject: [PATCH] --- yaml --- r: 17031 b: refs/heads/master c:
 987d4613e52e4f655278265aabbcc69237018b1d h: refs/heads/master i:   17029:
 27c2e48b30832dc35dc7315193c7efa3cff4881a   17027:
 64f47564cb0fd6ee1c40b35e3363558903f555c2   17023:
 4535d02fd8f1ab7271430b99c1c4e2adefe45943 v: v3

---
 [refs]                       | 2 +-
 trunk/arch/i386/Kconfig      | 2 +-
 trunk/arch/i386/kernel/apm.c | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 261e1af91948..e4744a93fa8b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9fe656e91fd95d0893cc4831b032e0be60791bd7
+refs/heads/master: 987d4613e52e4f655278265aabbcc69237018b1d
diff --git a/trunk/arch/i386/Kconfig b/trunk/arch/i386/Kconfig
index 486449e9e710..810ba8c37a5f 100644
--- a/trunk/arch/i386/Kconfig
+++ b/trunk/arch/i386/Kconfig
@@ -699,7 +699,7 @@ depends on PM && !X86_VISWS
 
 config APM
 	tristate "APM (Advanced Power Management) BIOS support"
-	depends on PM && PM_LEGACY
+	depends on PM
 	---help---
 	  APM is a BIOS specification for saving power using several different
 	  techniques. This is mostly useful for battery powered laptops with
diff --git a/trunk/arch/i386/kernel/apm.c b/trunk/arch/i386/kernel/apm.c
index 2d793d4aef1a..9d8827156e54 100644
--- a/trunk/arch/i386/kernel/apm.c
+++ b/trunk/arch/i386/kernel/apm.c
@@ -2291,7 +2291,9 @@ static int __init apm_init(void)
 		apm_info.disabled = 1;
 		return -ENODEV;
 	}
+#ifdef CONFIG_PM_LEGACY
 	pm_active = 1;
+#endif
 
 	/*
 	 * Set up a segment that references the real mode segment 0x40
@@ -2382,7 +2384,9 @@ static void __exit apm_exit(void)
 	exit_kapmd = 1;
 	while (kapmd_running)
 		schedule();
+#ifdef CONFIG_PM_LEGACY
 	pm_active = 0;
+#endif
 }
 
 module_init(apm_init);