summaryrefslogtreecommitdiffstats
path: root/hw
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2013-03-11 11:31:26 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2013-03-11 07:39:47 -0500
commitbba18e23f7266d63734fd31045fec7794cc34a38 (patch)
treed1d1aff098eb364d4b76035147ac175d5a302304 /hw
parentfa3889162ff724d09eb6b6bd06ba54769100a77f (diff)
downloadhqemu-bba18e23f7266d63734fd31045fec7794cc34a38.zip
hqemu-bba18e23f7266d63734fd31045fec7794cc34a38.tar.gz
arm: fix compilation with CONFIG_FDT
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 <pbonzini@redhat.com> Message-id: 1362997886-9470-1-git-send-email-pbonzini@redhat.com Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw')
-rw-r--r--hw/arm/Makefile.objs1
1 files changed, 0 insertions, 1 deletions
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))
OpenPOWER on IntegriCloud