[ACPI] Merge acpi-2.6.12 branch into 2.6.13-rc3

[firefly-linux-kernel-4.4.55.git] / drivers / acpi / Kconfig

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 86c52520ed348aa5049823dd2c5a55cfcb40513f..66c60982ba4677421c351447fca646d0c451d711 100644 (file)
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -3,6 +3,7 @@
 #
 
 menu "ACPI (Advanced Configuration and Power Interface) Support"
+       depends on PM
        depends on !X86_VISWS
        depends on !IA64_HP_SIM
        depends on IA64 || X86
@@ -48,7 +49,6 @@ config ACPI_BOOT
 
 config ACPI_INTERPRETER
        bool
-       depends on !IA64_SGI_SN
        default y
 
 if ACPI_INTERPRETER
@@ -79,6 +79,14 @@ config ACPI_SLEEP_PROC_FS
        depends on ACPI_SLEEP && PROC_FS
        default y
 
+config ACPI_SLEEP_PROC_SLEEP
+       bool "/proc/acpi/sleep (deprecated)"
+       depends on ACPI_SLEEP_PROC_FS
+       default n
+       ---help---
+         Create /proc/acpi/sleep
+         Deprecated by /sys/power/state
+
 config ACPI_AC
        tristate "AC Adapter"
        depends on X86
@@ -99,7 +107,6 @@ config ACPI_BATTERY
 
 config ACPI_BUTTON
        tristate "Button"
-       depends on !IA64_SGI_SN
        default m
        help
          This driver registers for events based on buttons, such as the
@@ -111,7 +118,6 @@ config ACPI_BUTTON
 config ACPI_VIDEO
        tristate "Video"
        depends on EXPERIMENTAL
-       depends on !IA64_SGI_SN
        default m
        help
          This driver implement the ACPI Extensions For Display Adapters
@@ -122,9 +128,18 @@ config ACPI_VIDEO
          Note that this is an ref. implementation only.  It may or may not work
          for your integrated video device.
 
+config ACPI_HOTKEY
+       tristate "Generic Hotkey"
+       depends on ACPI_INTERPRETER
+       depends on EXPERIMENTAL
+       depends on !IA64_SGI_SN
+       default n
+       help
+         Experimental consolidated hotkey driver.
+         If you are unsure, say N.
+
 config ACPI_FAN
        tristate "Fan"
-       depends on !IA64_SGI_SN
        default m
        help
          This driver adds support for ACPI fan devices, allowing user-mode 
@@ -132,7 +147,6 @@ config ACPI_FAN
 
 config ACPI_PROCESSOR
        tristate "Processor"
-       depends on !IA64_SGI_SN
        default m
        help
          This driver installs ACPI as the idle handler for Linux, and uses
@@ -140,13 +154,10 @@ config ACPI_PROCESSOR
          support it.
 
 config ACPI_HOTPLUG_CPU
-       bool "Processor Hotplug (EXPERIMENTAL)"
-       depends on ACPI_PROCESSOR && HOTPLUG_CPU && EXPERIMENTAL
-       depends on !IA64_SGI_SN
+       bool
+       depends on ACPI_PROCESSOR && HOTPLUG_CPU
        select ACPI_CONTAINER
-       default n
-        ---help---
-        Select this option if your platform support physical CPU hotplug.
+       default y
 
 config ACPI_THERMAL
        tristate "Thermal Zone"
@@ -262,7 +273,6 @@ config ACPI_BLACKLIST_YEAR
 
 config ACPI_DEBUG
        bool "Debug Statements"
-       depends on !IA64_SGI_SN
        default n
        help
          The ACPI driver can optionally report errors with a great deal
@@ -271,7 +281,6 @@ config ACPI_DEBUG
 
 config ACPI_BUS
        bool
-       depends on !IA64_SGI_SN
        default y
 
 config ACPI_EC
@@ -285,17 +294,14 @@ config ACPI_EC
 
 config ACPI_POWER
        bool
-       depends on !IA64_SGI_SN
        default y
 
 config ACPI_PCI
        bool
-       depends on !IA64_SGI_SN
        default PCI
 
 config ACPI_SYSTEM
        bool
-       depends on !IA64_SGI_SN
        default y
        help
          This driver will enable your system to shut down using ACPI, and
@@ -327,8 +333,13 @@ config ACPI_CONTAINER
        depends on EXPERIMENTAL
        default (ACPI_HOTPLUG_MEMORY || ACPI_HOTPLUG_CPU || ACPI_HOTPLUG_IO)
         ---help---
-               This is the ACPI generic container driver which supports
-               ACPI0004, PNP0A05 and PNP0A06 devices
+         This allows _physical_ insertion and removal of CPUs and memory.
+         This can be useful, for example, on NUMA machines that support
+         ACPI based physical hotplug of nodes, or non-NUMA machines that
+         support physical cpu/memory hot-plug.
+
+         If one selects "m", this driver can be loaded with
+         "modprobe acpi_container".
 
 config ACPI_HOTPLUG_MEMORY
        tristate "Memory Hotplug"