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

[qemu.git] / hw / arm / Makefile.objs

diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs
index aebbc866e24ecd847fef04a1f2dac9656a9d851f..2d9c69dfce2b208825f1e7b0391df2c5d081ed26 100644 (file)
--- a/hw/arm/Makefile.objs
+++ b/hw/arm/Makefile.objs
@@ -23,6 +23,8 @@ obj-y += bitbang_i2c.o marvell_88w8618_audio.o
 obj-y += framebuffer.o
 obj-y += strongarm.o
 obj-y += imx_serial.o imx_ccm.o imx_timer.o imx_avic.o
+obj-$(CONFIG_FDT) += ../device_tree.o
+obj-$(CONFIG_KVM) += kvm/arm_gic.o
 
 obj-y := $(addprefix ../,$(obj-y))