projects / qemu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: fa38891) | patch
arm: fix compilation with CONFIG_FDT
authorPaolo Bonzini <pbonzini@redhat.com>
Mon, 11 Mar 2013 10:31:26 +0000 (11:31 +0100)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 11 Mar 2013 12:39:47 +0000 (07:39 -0500)
commitbba18e23f7266d63734fd31045fec7794cc34a38
treed1d1aff098eb364d4b76035147ac175d5a302304tree | snapshot
parentfa3889162ff724d09eb6b6bd06ba54769100a77fcommit | diff
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>
hw/arm/Makefile.objs diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.