From patchwork Mon Oct 21 17:11:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 11202761 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 57A28913 for ; Mon, 21 Oct 2019 17:13:28 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 236602084B for ; Mon, 21 Oct 2019 17:13:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="LO+viWWw" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 236602084B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:45826 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMbFG-0001G8-UZ for patchwork-qemu-devel@patchwork.kernel.org; Mon, 21 Oct 2019 13:13:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43087) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMbDN-0007CG-6D for qemu-devel@nongnu.org; Mon, 21 Oct 2019 13:11:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iMbDM-00070y-40 for qemu-devel@nongnu.org; Mon, 21 Oct 2019 13:11:29 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:41455 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iMbDL-00070H-SU for qemu-devel@nongnu.org; Mon, 21 Oct 2019 13:11:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571677887; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=urZwjrB0hyZWYBw9TOwgAY1JXOm1yLurCxMDKdHVP1k=; b=LO+viWWwU0x7/ubfBGYMNr2cdFvT6xAG9QUBZ7Z4NEwTa1DKca/IDUDWHXxLmHQPPfMy77 yztDR5OR0DnMOA349+dX6AJcOUcD5VSYh/tXdrjC13rzKV4QtUfNVprrVIJQ+7QEYhjza1 8g4Vq41nGedNR9tkT7ywSuTKdklEsxk= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-157-EuqgLGh4P-m3k2y6k3Ni_g-1; Mon, 21 Oct 2019 13:11:25 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1F0F6107AD31 for ; Mon, 21 Oct 2019 17:11:25 +0000 (UTC) Received: from donizetti.redhat.com (unknown [10.36.112.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id 46BCA10016EB; Mon, 21 Oct 2019 17:11:21 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH] memory-device: simplify Makefile.objs conditions Date: Mon, 21 Oct 2019 19:11:20 +0200 Message-Id: <20191021171120.17947-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: EuqgLGh4P-m3k2y6k3Ni_g-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thuth@redhat.com, philmd@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" 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 Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth --- hw/mem/Makefile.objs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/mem/Makefile.objs b/hw/mem/Makefile.objs index 3e2f7c5ca2..56345befd0 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