summaryrefslogtreecommitdiffstats
path: root/arch/x86/boot/Makefile
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2020-02-11 23:48:22 +0100
committerOlof Johansson <olof@lixom.net>2020-02-11 23:48:22 +0100
commit1b32b72b27341cafe5f1c8e3ebd26387a8faf664 (patch)
tree6a12892ac6d64bc6bff072a37746244d3edd34fb /arch/x86/boot/Makefile
parentMerge tag 'juno-fix-5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/sud... (diff)
parentLinux 5.6-rc1 (diff)
downloadlinux-1b32b72b27341cafe5f1c8e3ebd26387a8faf664.tar.xz
linux-1b32b72b27341cafe5f1c8e3ebd26387a8faf664.zip
Merge tag 'v5.6-rc1' into arm/fixes
Linux 5.6-rc1 Merging in to avoid fixes pull request diffstats being noisy due to being based on -rc1. Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/x86/boot/Makefile')
-rw-r--r--arch/x86/boot/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
index 748b6d28a91d..012b82fc8617 100644
--- a/arch/x86/boot/Makefile
+++ b/arch/x86/boot/Makefile
@@ -45,8 +45,8 @@ setup-y += video-vesa.o
setup-y += video-bios.o
targets += $(setup-y)
-hostprogs-y := tools/build
-hostprogs-$(CONFIG_X86_FEATURE_NAMES) += mkcpustr
+hostprogs := tools/build
+hostprogs += mkcpustr
HOST_EXTRACFLAGS += -I$(srctree)/tools/include \
-include include/generated/autoconf.h \