Merge branches 'acpi-processor', 'acpi-cppc', 'acpi-apei' and 'acpi-sleep'

[cascardo/linux.git] / drivers / acpi / Kconfig

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index b7e2e77..8e27d16 100644 (file)
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -213,6 +213,10 @@ config ACPI_CPU_FREQ_PSS
        bool
        select THERMAL
 
+config ACPI_PROCESSOR_CSTATE
+       def_bool y
+       depends on IA64 || X86
+
 config ACPI_PROCESSOR_IDLE
        bool
        select CPU_IDLE
@@ -234,7 +238,7 @@ config ACPI_CPPC_LIB
 config ACPI_PROCESSOR
        tristate "Processor"
        depends on X86 || IA64 || ARM64
-       select ACPI_PROCESSOR_IDLE if X86 || IA64
+       select ACPI_PROCESSOR_IDLE
        select ACPI_CPU_FREQ_PSS if X86 || IA64
        default y
        help
@@ -291,8 +295,8 @@ config ACPI_THERMAL
 config ACPI_NUMA
        bool "NUMA support"
        depends on NUMA
-       depends on (X86 || IA64)
-       default y if IA64_GENERIC || IA64_SGI_SN2
+       depends on (X86 || IA64 || ARM64)
+       default y if IA64_GENERIC || IA64_SGI_SN2 || ARM64
 
 config ACPI_CUSTOM_DSDT_FILE
        string "Custom DSDT Table file to include"
@@ -311,9 +315,12 @@ config ACPI_CUSTOM_DSDT
        bool
        default ACPI_CUSTOM_DSDT_FILE != ""
 
+config ARCH_HAS_ACPI_TABLE_UPGRADE
+       def_bool n
+
 config ACPI_TABLE_UPGRADE
        bool "Allow upgrading ACPI tables via initrd"
-       depends on BLK_DEV_INITRD && X86
+       depends on BLK_DEV_INITRD && ARCH_HAS_ACPI_TABLE_UPGRADE
        default y
        help
          This option provides functionality to upgrade arbitrary ACPI tables
@@ -521,4 +528,12 @@ config XPOWER_PMIC_OPREGION
 
 endif
 
+config ACPI_CONFIGFS
+       tristate "ACPI configfs support"
+       select CONFIGFS_FS
+       help
+         Select this option to enable support for ACPI configuration from
+         userspace. The configurable ACPI groups will be visible under
+         /config/acpi, assuming configfs is mounted under /config.
+
 endif  # ACPI