diff options
| author | Len Brown <len.brown@intel.com> | 2007-07-22 10:27:40 +0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-07-22 10:27:40 +0400 |
| commit | f79e3185dd0f8650022518d7624c876d8929061b (patch) | |
| tree | 4cec3a434036031b4e2d4fef608f5523fb21c829 /drivers/acpi/Kconfig | |
| parent | e8b495fe09bc793ae26774e7b2667f7f658d56e2 (diff) | |
| parent | 8b8eb7d8cfc6cd95ed00cd58754e8493322505bd (diff) | |
| download | linux-f79e3185dd0f8650022518d7624c876d8929061b.tar.xz | |
Pull misc into release branch
Conflicts:
Documentation/feature-removal-schedule.txt
Diffstat (limited to 'drivers/acpi/Kconfig')
| -rw-r--r-- | drivers/acpi/Kconfig | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index 1121a1f4b5d7..501ed6ffa40f 100644 --- a/drivers/acpi/Kconfig +++ b/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--- The Procfs interface for ACPI is made optional for backward compatibility. @@ -338,7 +332,6 @@ config ACPI_CONTAINER config ACPI_HOTPLUG_MEMORY tristate "Memory Hotplug" - depends on ACPI depends on MEMORY_HOTPLUG default n help @@ -367,5 +360,3 @@ config ACPI_SBS to today's ACPI "Control Method" battery. endif # ACPI - -endmenu |