Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8daa1905 authored Dec 01, 2008 by Niels de Vos Committed by Ingo Molnar Dec 02, 2008

x86, apm: remove CONFIG_APM_REAL_MODE_POWER_OFF in favor of a kernel parameter

Remove CONFIG_APM_REAL_MODE_POWER_OFF like CONFIG_APM_POWER_OFF which
has been done for linux-2.2.14pre8 (http://lkml.org/lkml/1999/11/23/3).

Re-introducing CONFIG_APM_POWER_OFF got nack-ed. Stephen didn't bother
to remove CONFIG_APM_REAL_MODE_POWER_OFF, let's get rid of it now.
	Reference: http://lkml.org/lkml/2008/5/7/97



Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

parent b47b9288

arch/x86/Kconfig

+0 −7

Original line number	Diff line number	Diff line
		@@ -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"

arch/x86/kernel/apm_32.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -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