Merge branches 'acpi-pci', 'acpi-misc' and 'acpi-tools'

[mirror_ubuntu-artful-kernel.git] / drivers / acpi / Kconfig

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 82b96ee8624c2b2713e981e9d9c4b0aefb9ae811..b7e2e776397d8384dd6459c0a9e9f94b097c113f 100644 (file)
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -5,10 +5,10 @@
 menuconfig ACPI
        bool "ACPI (Advanced Configuration and Power Interface) Support"
        depends on !IA64_HP_SIM
-       depends on IA64 || X86 || (ARM64 && EXPERT)
+       depends on IA64 || X86 || ARM64
        depends on PCI
        select PNP
-       default y
+       default y if (IA64 || X86)
        help
          Advanced Configuration and Power Interface (ACPI) support for 
          Linux requires an ACPI-compliant platform (hardware/firmware),
@@ -311,12 +311,12 @@ config ACPI_CUSTOM_DSDT
        bool
        default ACPI_CUSTOM_DSDT_FILE != ""
 
-config ACPI_INITRD_TABLE_OVERRIDE
-       bool "ACPI tables override via initrd"
+config ACPI_TABLE_UPGRADE
+       bool "Allow upgrading ACPI tables via initrd"
        depends on BLK_DEV_INITRD && X86
-       default n
+       default y
        help
-         This option provides functionality to override arbitrary ACPI tables
+         This option provides functionality to upgrade arbitrary ACPI tables
          via initrd. No functional change if no ACPI tables are passed via
          initrd, therefore it's safe to say Y.
          See Documentation/acpi/initrd_table_override.txt for details