From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:40802) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UF010-0003RC-2X for qemu-devel@nongnu.org; Mon, 11 Mar 2013 06:31:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UF00y-00013R-F5 for qemu-devel@nongnu.org; Mon, 11 Mar 2013 06:31:34 -0400 Received: from mail-wg0-f50.google.com ([74.125.82.50]:62341) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UF00y-00013G-8M for qemu-devel@nongnu.org; Mon, 11 Mar 2013 06:31:32 -0400 Received: by mail-wg0-f50.google.com with SMTP id es5so4830059wgb.5 for ; Mon, 11 Mar 2013 03:31:31 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 11 Mar 2013 11:31:26 +0100 Message-Id: <1362997886-9470-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH build-breaker] arm: fix compilation with CONFIG_FDT List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: blauwirbel@gmail.com, peter.maydell@linaro.org, aliguori@us.ibm.com A conflict was resolved the wrong way when merging commit 320ba5f (build: always link device_tree.o into emulators if libfdt available, 2013-02-05). This causes a build failure for the arm-softmmu target due to multiply defined symbol. Signed-off-by: Paolo Bonzini --- hw/arm/Makefile.objs | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index 2d9c69d..f5f7d0e 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -23,7 +23,6 @@ obj-y += bitbang_i2c.o marvell_88w8618_audio.o obj-y += framebuffer.o obj-y += strongarm.o obj-y += imx_serial.o imx_ccm.o imx_timer.o imx_avic.o -obj-$(CONFIG_FDT) += ../device_tree.o obj-$(CONFIG_KVM) += kvm/arm_gic.o obj-y := $(addprefix ../,$(obj-y)) -- 1.8.1.4