Commit 79463318 authored by Jan Engelhardt's avatar Jan Engelhardt Committed by Andi Kleen

[PATCH] i386: Use menuconfig objects - APM

(I hope Andi is the right one to Cc, otherwise please add, thanks!)

Use menuconfigs instead of menus, so the whole menu can be disabled at
once instead of going through all options.
Signed-off-by: default avatarJan Engelhardt <jengelh@gmx.de>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
parent f039b754
...@@ -915,12 +915,9 @@ source kernel/power/Kconfig ...@@ -915,12 +915,9 @@ source kernel/power/Kconfig
source "drivers/acpi/Kconfig" source "drivers/acpi/Kconfig"
menu "APM (Advanced Power Management) BIOS Support" menuconfig APM
depends on PM && !X86_VISWS
config APM
tristate "APM (Advanced Power Management) BIOS support" tristate "APM (Advanced Power Management) BIOS support"
depends on PM depends on PM && !X86_VISWS
---help--- ---help---
APM is a BIOS specification for saving power using several different APM is a BIOS specification for saving power using several different
techniques. This is mostly useful for battery powered laptops with techniques. This is mostly useful for battery powered laptops with
...@@ -977,9 +974,10 @@ config APM ...@@ -977,9 +974,10 @@ config APM
To compile this driver as a module, choose M here: the To compile this driver as a module, choose M here: the
module will be called apm. module will be called apm.
if APM
config APM_IGNORE_USER_SUSPEND config APM_IGNORE_USER_SUSPEND
bool "Ignore USER SUSPEND" bool "Ignore USER SUSPEND"
depends on APM
help help
This option will ignore USER SUSPEND requests. On machines with a This option will ignore USER SUSPEND requests. On machines with a
compliant APM BIOS, you want to say N. However, on the NEC Versa M compliant APM BIOS, you want to say N. However, on the NEC Versa M
...@@ -987,7 +985,6 @@ config APM_IGNORE_USER_SUSPEND ...@@ -987,7 +985,6 @@ config APM_IGNORE_USER_SUSPEND
config APM_DO_ENABLE config APM_DO_ENABLE
bool "Enable PM at boot time" bool "Enable PM at boot time"
depends on APM
---help--- ---help---
Enable APM features at boot time. From page 36 of the APM BIOS Enable APM features at boot time. From page 36 of the APM BIOS
specification: "When disabled, the APM BIOS does not automatically specification: "When disabled, the APM BIOS does not automatically
...@@ -1005,7 +1002,6 @@ config APM_DO_ENABLE ...@@ -1005,7 +1002,6 @@ config APM_DO_ENABLE
config APM_CPU_IDLE config APM_CPU_IDLE
bool "Make CPU Idle calls when idle" bool "Make CPU Idle calls when idle"
depends on APM
help help
Enable calls to APM CPU Idle/CPU Busy inside the kernel's idle loop. Enable calls to APM CPU Idle/CPU Busy inside the kernel's idle loop.
On some machines, this can activate improved power savings, such as On some machines, this can activate improved power savings, such as
...@@ -1017,7 +1013,6 @@ config APM_CPU_IDLE ...@@ -1017,7 +1013,6 @@ config APM_CPU_IDLE
config APM_DISPLAY_BLANK config APM_DISPLAY_BLANK
bool "Enable console blanking using APM" bool "Enable console blanking using APM"
depends on APM
help help
Enable console blanking using the APM. Some laptops can use this to Enable console blanking using the APM. Some laptops can use this to
turn off the LCD backlight when the screen blanker of the Linux turn off the LCD backlight when the screen blanker of the Linux
...@@ -1031,7 +1026,6 @@ config APM_DISPLAY_BLANK ...@@ -1031,7 +1026,6 @@ config APM_DISPLAY_BLANK
config APM_ALLOW_INTS config APM_ALLOW_INTS
bool "Allow interrupts during APM BIOS calls" bool "Allow interrupts during APM BIOS calls"
depends on APM
help help
Normally we disable external interrupts while we are making calls to Normally we disable external interrupts while we are making calls to
the APM BIOS as a measure to lessen the effects of a badly behaving the APM BIOS as a measure to lessen the effects of a badly behaving
...@@ -1042,13 +1036,12 @@ config APM_ALLOW_INTS ...@@ -1042,13 +1036,12 @@ config APM_ALLOW_INTS
config APM_REAL_MODE_POWER_OFF config APM_REAL_MODE_POWER_OFF
bool "Use real mode APM BIOS call to power off" bool "Use real mode APM BIOS call to power off"
depends on APM
help help
Use real mode APM BIOS calls to switch off the computer. This is 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 a work-around for a number of buggy BIOSes. Switch this option on if
your computer crashes instead of powering off properly. your computer crashes instead of powering off properly.
endmenu endif # APM
source "arch/i386/kernel/cpu/cpufreq/Kconfig" source "arch/i386/kernel/cpu/cpufreq/Kconfig"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment