[Qemu-devel] [PATCH build-breaker] arm: fix compilation with CONFIG_FDT

[Paolo Bonzini]

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 <address@hidden>
---
 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