Subject: [merged] firmware-google-drop-select-efi-to-avoid-recursive-dependency.patch removed from -mm tree
To: ard.biesheuvel@xxxxxxxxxx,mikew@xxxxxxxxxx,rientjes@xxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Tue, 28 Jan 2014 11:10:01 -0800
The patch titled
Subject: firmware/google: drop 'select EFI' to avoid recursive dependency
has been removed from the -mm tree. Its filename was
firmware-google-drop-select-efi-to-avoid-recursive-dependency.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Ard Biesheuvel <ard.biesheuvel@xxxxxxxxxx>
Subject: firmware/google: drop 'select EFI' to avoid recursive dependency
The GOOGLE_SMI Kconfig symbol depends on DMI and selects EFI. This causes
problems on other archs when introducing DMI support that depends on EFI,
as it results in a recursive dependency:
arch/arm/Kconfig:1845:error: recursive dependency detected!
arch/arm/Kconfig:1845: symbol DMI depends on EFI
Fix by changing the 'select EFI' to a 'depends on EFI'.
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@xxxxxxxxxx>
Cc: David Rientjes <rientjes@xxxxxxxxxx>
Acked-by: Mike Waychison <mikew@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/firmware/google/Kconfig | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff -puN drivers/firmware/google/Kconfig~firmware-google-drop-select-efi-to-avoid-recursive-dependency drivers/firmware/google/Kconfig
--- a/drivers/firmware/google/Kconfig~firmware-google-drop-select-efi-to-avoid-recursive-dependency
+++ a/drivers/firmware/google/Kconfig
@@ -12,8 +12,7 @@ menu "Google Firmware Drivers"
config GOOGLE_SMI
tristate "SMI interface for Google platforms"
- depends on ACPI && DMI
- select EFI
+ depends on ACPI && DMI && EFI
select EFI_VARS
help
Say Y here if you want to enable SMI callbacks for Google
_
Patches currently in -mm which might be from ard.biesheuvel@xxxxxxxxxx are
origin.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
