diff options
| author | Paolo Bonzini | 2013-03-11 11:31:26 +0100 |
|---|---|---|
| committer | Anthony Liguori | 2013-03-11 13:39:47 +0100 |
| commit | bba18e23f7266d63734fd31045fec7794cc34a38 (patch) | |
| tree | d1d1aff098eb364d4b76035147ac175d5a302304 /include | |
| parent | Merge remote-tracking branch 'origin/master' into staging (diff) | |
| download | qemu-bba18e23f7266d63734fd31045fec7794cc34a38.tar.gz qemu-bba18e23f7266d63734fd31045fec7794cc34a38.tar.xz qemu-bba18e23f7266d63734fd31045fec7794cc34a38.zip | |
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 'include')
0 files changed, 0 insertions, 0 deletions