firmware/google: drop 'select EFI' to avoid recursive dependency
authorArd Biesheuvel <ard.biesheuvel@linaro.org>
Tue, 28 Jan 2014 01:07:21 +0000 (17:07 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 28 Jan 2014 05:02:40 +0000 (21:02 -0800)
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>
drivers/firmware/google/Kconfig

index 2f21b0bfe6534c6478b6ee6ec8fbd8c86351329e..29c8cdda82a11dd423c4c5683c0244eaebf0de8f 100644 (file)
@@ -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