Merge v5.14-rc3 into usb-next

[linux-2.6-microblaze.git] / drivers / acpi / Kconfig

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index eedec61..8f9940f 100644 (file)
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -370,7 +370,7 @@ config ACPI_TABLE_UPGRADE
 config ACPI_TABLE_OVERRIDE_VIA_BUILTIN_INITRD
        bool "Override ACPI tables from built-in initrd"
        depends on ACPI_TABLE_UPGRADE
-       depends on INITRAMFS_SOURCE!="" && INITRAMFS_COMPRESSION=""
+       depends on INITRAMFS_SOURCE!="" && INITRAMFS_COMPRESSION_NONE
        help
          This option provides functionality to override arbitrary ACPI tables
          from built-in uncompressed initrd.
@@ -526,6 +526,9 @@ endif
 
 source "drivers/acpi/pmic/Kconfig"
 
+config ACPI_VIOT
+       bool
+
 endif  # ACPI
 
 config X86_PM_TIMER
@@ -543,3 +546,18 @@ config X86_PM_TIMER
 
          You should nearly always say Y here because many modern
          systems require this timer.
+
+config ACPI_PRMT
+       bool "Platform Runtime Mechanism Support"
+       depends on EFI && X86_64
+       default y
+       help
+         Platform Runtime Mechanism (PRM) is a firmware interface exposing a
+         set of binary executables that can be called from the AML interpreter
+         or directly from device drivers.
+
+         Say Y to enable the AML interpreter to execute the PRM code.
+
+         While this feature is optional in principle, leaving it out may
+         substantially increase computational overhead related to the
+         initialization of some server systems.