On 11 March 2013 10:31, Paolo Bonzini <pbonz...@redhat.com> wrote: > 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 <pbonz...@redhat.com>
Tested-by: Peter Maydell <peter.mayd...@linaro.org> Fixes the --enable-fdt build and ARM targets using device tree work OK. thanks -- PMM