summaryrefslogtreecommitdiffstats
path: root/arch/ia64
diff options
context:
space:
mode:
authorMasahiro Yamada <masahiroy@kernel.org>2022-09-29 20:17:15 +0200
committerMasahiro Yamada <masahiroy@kernel.org>2022-10-02 20:53:12 +0200
commitcff6fdf0b2d45f563e2c25f243c624a2723d5f58 (patch)
tree447fc9c8890df833a5299987261ffd9dd7973eeb /arch/ia64
parentRevert "kbuild: Check if linker supports the -X option" (diff)
downloadlinux-cff6fdf0b2d45f563e2c25f243c624a2723d5f58.tar.xz
linux-cff6fdf0b2d45f563e2c25f243c624a2723d5f58.zip
ia64: simplify esi object addition in Makefile
CONFIG_IA64_ESI is a bool option. I do not know why the Makefile was written like this, but this should not have any functional change. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Reviewed-by: Nicolas Schier <nicolas@fjasle.eu>
Diffstat (limited to 'arch/ia64')
-rw-r--r--arch/ia64/kernel/Makefile5
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/ia64/kernel/Makefile b/arch/ia64/kernel/Makefile
index 4a1fcb121dda..ae9ff07de4ab 100644
--- a/arch/ia64/kernel/Makefile
+++ b/arch/ia64/kernel/Makefile
@@ -34,10 +34,7 @@ mca_recovery-y += mca_drv.o mca_drv_asm.o
obj-$(CONFIG_IA64_MC_ERR_INJECT)+= err_inject.o
obj-$(CONFIG_STACKTRACE) += stacktrace.o
-obj-$(CONFIG_IA64_ESI) += esi.o
-ifneq ($(CONFIG_IA64_ESI),)
-obj-y += esi_stub.o # must be in kernel proper
-endif
+obj-$(CONFIG_IA64_ESI) += esi.o esi_stub.o # must be in kernel proper
obj-$(CONFIG_INTEL_IOMMU) += pci-dma.o
obj-$(CONFIG_ELF_CORE) += elfcore.o