summaryrefslogtreecommitdiffstats
path: root/drivers/firmware
diff options
context:
space:
mode:
authorArd Biesheuvel2014-01-28 02:07:21 +0100
committerLinus Torvalds2014-01-28 06:02:40 +0100
commitc2218e26c0d03c368fff825a6f15b7bb3418dbde (patch)
tree2361216b1b5ad5a43ebeab625e166c4a0b61ef12 /drivers/firmware
parentcompat: fix sys_fanotify_mark (diff)
downloadkernel-qcow2-linux-c2218e26c0d03c368fff825a6f15b7bb3418dbde.tar.gz
kernel-qcow2-linux-c2218e26c0d03c368fff825a6f15b7bb3418dbde.tar.xz
kernel-qcow2-linux-c2218e26c0d03c368fff825a6f15b7bb3418dbde.zip
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@linaro.org> Cc: David Rientjes <rientjes@google.com> Acked-by: Mike Waychison <mikew@google.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/firmware')
-rw-r--r--drivers/firmware/google/Kconfig3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/firmware/google/Kconfig b/drivers/firmware/google/Kconfig
index 2f21b0bfe653..29c8cdda82a1 100644
--- a/drivers/firmware/google/Kconfig
+++ b/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