[Qemu-commits] [qemu/qemu] bba18e: arm: fix compilation with CONFIG_FDT

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: bba18e23f7266d63734fd31045fec7794cc34a38
      
https://github.com/qemu/qemu/commit/bba18e23f7266d63734fd31045fec7794cc34a38
  Author: Paolo Bonzini <address@hidden>
  Date:   2013-03-11 (Mon, 11 Mar 2013)

  Changed paths:
    M hw/arm/Makefile.objs

  Log Message:
  -----------
  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 <address@hidden>
Message-id: address@hidden
Signed-off-by: Anthony Liguori <address@hidden>