Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d27c0d90 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86/efix fixes from Peter Anvin:
 "Two EFI-related Kconfig changes, which happen to touch immediately
  adjacent lines in Kconfig and thus collapse to a single patch"

* 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/efi: Enforce CONFIG_RELOCATABLE for EFI boot stub
  x86/efi: Fix 3DNow optimization build failure in EFI stub
parents 7453f33b 9e13bcf7

arch/x86/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -1541,7 +1541,8 @@ config EFI 


config EFI_STUB

       bool "EFI stub support"

       depends on EFI

       depends on EFI && !X86_USE_3DNOW

       select RELOCATABLE

       ---help---

          This kernel feature allows a bzImage to be loaded directly

	  by EFI firmware without the use of a bootloader.