aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/Kconfig7
-rw-r--r--arch/x86/kernel/apm_32.c4
2 files changed, 0 insertions, 11 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 4cf0ab13d187..ebcad15ccf35 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1629,13 +1629,6 @@ config APM_ALLOW_INTS
1629 many of the newer IBM Thinkpads. If you experience hangs when you 1629 many of the newer IBM Thinkpads. If you experience hangs when you
1630 suspend, try setting this to Y. Otherwise, say N. 1630 suspend, try setting this to Y. Otherwise, say N.
1631 1631
1632config APM_REAL_MODE_POWER_OFF
1633 bool "Use real mode APM BIOS call to power off"
1634 help
1635 Use real mode APM BIOS calls to switch off the computer. This is
1636 a work-around for a number of buggy BIOSes. Switch this option on if
1637 your computer crashes instead of powering off properly.
1638
1639endif # APM 1632endif # APM
1640 1633
1641source "arch/x86/kernel/cpu/cpufreq/Kconfig" 1634source "arch/x86/kernel/cpu/cpufreq/Kconfig"
diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
index 5145a6e72bbb..3a26525a3f31 100644
--- a/arch/x86/kernel/apm_32.c
+++ b/arch/x86/kernel/apm_32.c
@@ -391,11 +391,7 @@ static int power_off;
391#else 391#else
392static int power_off = 1; 392static int power_off = 1;
393#endif 393#endif
394#ifdef CONFIG_APM_REAL_MODE_POWER_OFF
395static int realmode_power_off = 1;
396#else
397static int realmode_power_off; 394static int realmode_power_off;
398#endif
399#ifdef CONFIG_APM_ALLOW_INTS 395#ifdef CONFIG_APM_ALLOW_INTS
400static int allow_ints = 1; 396static int allow_ints = 1;
401#else 397#else