From: Masahiro Yamada Date: Thu, 29 Sep 2022 18:17:15 +0000 (+0900) Subject: ia64: simplify esi object addition in Makefile X-Git-Tag: v6.1-rc1~87^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cff6fdf0b2d45f563e2c25f243c624a2723d5f58;p=thirdparty%2Fkernel%2Flinux.git 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 Reviewed-by: Nicolas Schier --- diff --git a/arch/ia64/kernel/Makefile b/arch/ia64/kernel/Makefile index 4a1fcb121ddab..ae9ff07de4abe 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