| From d9ed57fcb3d5aab70b64446839f83232d6aefc70 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 15 Jul 2021 11:26:01 +0200 |
| Subject: ACPI: Kconfig: Fix table override from built-in initrd |
| |
| From: Robert Richter <rrichter@amd.com> |
| |
| [ Upstream commit d2cbbf1fe503c07e466c62f83aa1926d74d15821 ] |
| |
| During a rework of initramfs code the INITRAMFS_COMPRESSION config |
| option was removed in commit 65e00e04e5ae. A leftover as a dependency |
| broke the config option ACPI_TABLE_OVERRIDE_VIA_ BUILTIN_INITRD that |
| is used to enable the overriding of ACPI tables from built-in initrd. |
| Fixing the dependency. |
| |
| Fixes: 65e00e04e5ae ("initramfs: refactor the initramfs build rules") |
| Signed-off-by: Robert Richter <rrichter@amd.com> |
| Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/acpi/Kconfig | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig |
| index eedec61e3476..226f849fe7dc 100644 |
| --- 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. |
| -- |
| 2.30.2 |
| |
