From: Paolo Bonzini <pbonzini@redhat.com>
Date: Mon, 21 Oct 2019 17:11:09 +0000 (+0200)
Subject: memory-device: simplify Makefile.objs conditions
X-Git-Tag: v4.2.0-rc0~33^2~5^2~28
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7320c8b4ae610ad0b2faa3b049d8312b26f31518;p=thirdparty%2Fqemu.git

memory-device: simplify Makefile.objs conditions

hw/mem/ is only included if CONFIG_MEM_DEVICE is true, so we need not
specify the condition again in hw/mem/Makefile.objs.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/hw/mem/Makefile.objs b/hw/mem/Makefile.objs
index 3e2f7c5ca20..56345befd0c 100644
--- a/hw/mem/Makefile.objs
+++ b/hw/mem/Makefile.objs
@@ -1,3 +1,3 @@
 common-obj-$(CONFIG_DIMM) += pc-dimm.o
-common-obj-$(CONFIG_MEM_DEVICE) += memory-device.o
+common-obj-y += memory-device.o
 common-obj-$(CONFIG_NVDIMM) += nvdimm.o