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 b225c4b9ba140bd17eee6f9a19b2f09198c043a0..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),