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>
This commit is contained in:
committed by
Ingo Molnar
parent
b47b928842
commit
8daa19051e
@@ -1629,13 +1629,6 @@ config APM_ALLOW_INTS
|
|||||||
many of the newer IBM Thinkpads. If you experience hangs when you
|
many of the newer IBM Thinkpads. If you experience hangs when you
|
||||||
suspend, try setting this to Y. Otherwise, say N.
|
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
|
endif # APM
|
||||||
|
|
||||||
source "arch/x86/kernel/cpu/cpufreq/Kconfig"
|
source "arch/x86/kernel/cpu/cpufreq/Kconfig"
|
||||||
|
@@ -391,11 +391,7 @@ static int power_off;
|
|||||||
#else
|
#else
|
||||||
static int power_off = 1;
|
static int power_off = 1;
|
||||||
#endif
|
#endif
|
||||||
#ifdef CONFIG_APM_REAL_MODE_POWER_OFF
|
|
||||||
static int realmode_power_off = 1;
|
|
||||||
#else
|
|
||||||
static int realmode_power_off;
|
static int realmode_power_off;
|
||||||
#endif
|
|
||||||
#ifdef CONFIG_APM_ALLOW_INTS
|
#ifdef CONFIG_APM_ALLOW_INTS
|
||||||
static int allow_ints = 1;
|
static int allow_ints = 1;
|
||||||
#else
|
#else
|
||||||
|
Reference in New Issue
Block a user