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

[karo-tx-linux.git] / drivers / acpi / Kconfig

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index fa0d319283e31f0dc73994a5367e59410b0bcbe6..b7e2e776397d8384dd6459c0a9e9f94b097c113f 100644 (file)
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -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