[PATCH 01/30] Use menuconfig objects - ACPI

Jan Engelhardt
2007-04-10T19:23:30Z

Use menuconfigs instead of menus, so the whole menu can be disabled at
once instead of going through all options.

Signed-off-by: Jan Engelhardt <jengelh@gmx.de>

Index: linux-2.6.21-rc5/drivers/acpi/Kconfig
===================================================================
--- linux-2.6.21-rc5.orig/drivers/acpi/Kconfig
+++ linux-2.6.21-rc5/drivers/acpi/Kconfig
@@ -2,16 +2,12 @@
# ACPI Configuration
#

-menu "ACPI (Advanced Configuration and Power Interface) Support"
+menuconfig ACPI
+ bool "ACPI Support (Advanced Configuration and Power Interface) Support"
depends on !X86_NUMAQ
depends on !X86_VISWS
depends on !IA64_HP_SIM
depends on IA64 || X86
- depends on PM
-
-config ACPI
- bool "ACPI Support"
- depends on IA64 || X86
depends on PCI
depends on PM
select PNP
@@ -49,7 +45,6 @@ if ACPI
config ACPI_SLEEP
bool "Sleep States"
depends on X86 && (!SMP || SUSPEND_SMP)
- depends on PM
default y
---help---
This option adds support for ACPI suspend states.
@@ -82,7 +77,6 @@ config ACPI_SLEEP_PROC_SLEEP

config ACPI_PROCFS
bool "Procfs interface (deprecated)"
- depends on ACPI
default y
---help---
Procfs interface for ACPI is made optional for back-compatible.
@@ -367,7 +361,6 @@ config ACPI_CONTAINER

config ACPI_HOTPLUG_MEMORY
tristate "Memory Hotplug"
- depends on ACPI
depends on MEMORY_HOTPLUG
default n
help
@@ -397,5 +390,3 @@ config ACPI_SBS
to today's ACPI "Control Method" battery.

endif # ACPI
-
-endmenu
#<EOF>