[tip: efi/core] efi: remove some false dependencies on CONFIG_EFI_VARS

* [tip: efi/core] efi: remove some false dependencies on CONFIG_EFI_VARS
@ 2020-09-30  5:22 tip-bot2 for Ard Biesheuvel
  0 siblings, 0 replies; only message in thread
From: tip-bot2 for Ard Biesheuvel @ 2020-09-30  5:22 UTC (permalink / raw)
  To: linux-tip-commits; +Cc: Ard Biesheuvel, x86, LKML

The following commit has been merged into the efi/core branch of tip:

Commit-ID:     5ee70cd60652e85e4e8ced99f58f2fcbab405110
Gitweb:        https://git.kernel.org/tip/5ee70cd60652e85e4e8ced99f58f2fcbab405110
Author:        Ard Biesheuvel <ardb@kernel.org>
AuthorDate:    Wed, 23 Sep 2020 10:27:36 +02:00
Committer:     Ard Biesheuvel <ardb@kernel.org>
CommitterDate: Tue, 29 Sep 2020 19:40:57 +02:00

efi: remove some false dependencies on CONFIG_EFI_VARS

Remove some false dependencies on CONFIG_EFI_VARS, which only controls
the creation of the sysfs entries, whereas the underlying functionality
that these modules rely on is enabled unconditionally when CONFIG_EFI
is set.

Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
---
 drivers/firmware/efi/Kconfig | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/firmware/efi/Kconfig b/drivers/firmware/efi/Kconfig
index dd8d108..80f5c67 100644
--- a/drivers/firmware/efi/Kconfig
+++ b/drivers/firmware/efi/Kconfig
@@ -137,7 +137,6 @@ config EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER
 
 config EFI_BOOTLOADER_CONTROL
 	tristate "EFI Bootloader Control"
-	depends on EFI_VARS
 	default n
 	help
 	  This module installs a reboot hook, such that if reboot() is
@@ -281,7 +280,7 @@ config EFI_EARLYCON
 
 config EFI_CUSTOM_SSDT_OVERLAYS
 	bool "Load custom ACPI SSDT overlay from an EFI variable"
-	depends on EFI_VARS && ACPI
+	depends on EFI && ACPI
 	default ACPI_TABLE_UPGRADE
 	help
 	  Allow loading of an ACPI SSDT overlay from an EFI variable specified

^ permalink raw reply related	[flat|nested] only message in thread