From 09b8df7593a87d9e2847efb9197f03b2af2c9c3c Mon Sep 17 00:00:00 2001
From: Niels de Vos <niels.devos@wincor-nixdorf.com>
Date: Mon, 1 Dec 2008 14:13:53 -0800
Subject: [PATCH] --- yaml --- r: 120918 b: refs/heads/master c:
 8daa19051e1c7369c89ace7b18e74fe1f55dfa29 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/arch/x86/Kconfig         | 7 -------
 trunk/arch/x86/kernel/apm_32.c | 4 ----
 3 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 91eeca26cc96..c995a109dc80 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b47b92884212008b4bd044ba6b48b93c00b10ec6
+refs/heads/master: 8daa19051e1c7369c89ace7b18e74fe1f55dfa29
diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig
index 4cf0ab13d187..ebcad15ccf35 100644
--- a/trunk/arch/x86/Kconfig
+++ b/trunk/arch/x86/Kconfig
@@ -1629,13 +1629,6 @@ config APM_ALLOW_INTS
 	  many of the newer IBM Thinkpads.  If you experience hangs when you
 	  suspend, try setting this to Y.  Otherwise, say N.
 
-config APM_REAL_MODE_POWER_OFF
-	bool "Use real mode APM BIOS call to power off"
-	help
-	  Use real mode APM BIOS calls to switch off the computer. This is
-	  a work-around for a number of buggy BIOSes. Switch this option on if
-	  your computer crashes instead of powering off properly.
-
 endif # APM
 
 source "arch/x86/kernel/cpu/cpufreq/Kconfig"
diff --git a/trunk/arch/x86/kernel/apm_32.c b/trunk/arch/x86/kernel/apm_32.c
index 5145a6e72bbb..3a26525a3f31 100644
--- a/trunk/arch/x86/kernel/apm_32.c
+++ b/trunk/arch/x86/kernel/apm_32.c
@@ -391,11 +391,7 @@ static int power_off;
 #else
 static int power_off = 1;
 #endif
-#ifdef CONFIG_APM_REAL_MODE_POWER_OFF
-static int realmode_power_off = 1;
-#else
 static int realmode_power_off;
-#endif
 #ifdef CONFIG_APM_ALLOW_INTS
 static int allow_ints = 1;
 #else