Paolo Bonzini bba18e23f7 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>

2013-03-11 07:39:47 -05:00

..

armv7m.c

arm: move files referencing CPU to hw/arm/

2013-03-01 15:01:19 +01:00

boot.c

hw: move boards and other isolated files to hw/ARCH

2013-03-01 15:01:19 +01:00

collie.c

hw: move boards and other isolated files to hw/ARCH

2013-03-01 15:01:19 +01:00

exynos4_boards.c

hw: move boards and other isolated files to hw/ARCH

2013-03-01 15:01:19 +01:00

exynos4210.c

arm: move files referencing CPU to hw/arm/

2013-03-01 15:01:19 +01:00

gumstix.c

hw: move boards and other isolated files to hw/ARCH

2013-03-01 15:01:19 +01:00

highbank.c

hw: move boards and other isolated files to hw/ARCH

2013-03-01 15:01:19 +01:00

integratorcp.c

hw: move boards and other isolated files to hw/ARCH

2013-03-01 15:01:19 +01:00

kzm.c

hw: move boards and other isolated files to hw/ARCH

2013-03-01 15:01:19 +01:00

mainstone.c

hw: move boards and other isolated files to hw/ARCH

2013-03-01 15:01:19 +01:00

Makefile.objs

arm: fix compilation with CONFIG_FDT

2013-03-11 07:39:47 -05:00

musicpal.c

hw: move boards and other isolated files to hw/ARCH

2013-03-01 15:01:19 +01:00

nseries.c

hw: move boards and other isolated files to hw/ARCH

2013-03-01 15:01:19 +01:00

omap1.c

arm: move files referencing CPU to hw/arm/

2013-03-01 15:01:19 +01:00

omap2.c

arm: move files referencing CPU to hw/arm/

2013-03-01 15:01:19 +01:00

omap_sx1.c

hw: move boards and other isolated files to hw/ARCH

2013-03-01 15:01:19 +01:00

palm.c

hw: move boards and other isolated files to hw/ARCH

2013-03-01 15:01:19 +01:00

pic_cpu.c

Merge remote-tracking branch 'bonzini/hw-dirs' into staging

2013-03-10 19:56:35 -05:00

pxa2xx_gpio.c

arm: move files referencing CPU to hw/arm/

2013-03-01 15:01:19 +01:00

pxa2xx_pic.c

arm: move files referencing CPU to hw/arm/

2013-03-01 15:01:19 +01:00

pxa2xx.c

arm: move files referencing CPU to hw/arm/

2013-03-01 15:01:19 +01:00

realview.c

hw: move boards and other isolated files to hw/ARCH

2013-03-01 15:01:19 +01:00

spitz.c

hw: move boards and other isolated files to hw/ARCH

2013-03-01 15:01:19 +01:00

stellaris.c

hw: move boards and other isolated files to hw/ARCH

2013-03-01 15:01:19 +01:00

tosa.c

hw: move boards and other isolated files to hw/ARCH

2013-03-01 15:01:19 +01:00

versatilepb.c

hw: move boards and other isolated files to hw/ARCH

2013-03-01 15:01:19 +01:00

vexpress.c

hw: move boards and other isolated files to hw/ARCH

2013-03-01 15:01:19 +01:00

xilinx_zynq.c

hw: move boards and other isolated files to hw/ARCH

2013-03-01 15:01:19 +01:00

z2.c

hw: move boards and other isolated files to hw/ARCH

2013-03-01 15:01:19 +01:00