diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-13 18:21:35 -0600 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-13 18:21:35 -0600 |
| commit | d27c0d90184a13e9e9f28c38e84f889a259f6b5f (patch) | |
| tree | a933c7b9c9ac96af1787fa11317842557358bf86 /arch/x86 | |
| parent | 7453f33b2e07fc2835e24cda0893de83c78d8d76 (diff) | |
| parent | 9e13bcf7e0981f1db0c8c8255ac17d5f898903e9 (diff) | |
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
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 4aafd322e21..7a7208f16ec 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -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. |