Merge remote-tracking branch 'remotes/sstabellini/xen-2014-10-30' into staging

[qemu.git] / target-i386 / Makefile.objs

diff --git a/target-i386/Makefile.objs b/target-i386/Makefile.objs
index 3b629d4d39f47d73d8e5f9fb0afca7806b38e209..027b94e1d3f10307b4baa764a97dafb924cc8360 100644 (file)
--- a/target-i386/Makefile.objs
+++ b/target-i386/Makefile.objs
@@ -3,7 +3,7 @@ obj-y += excp_helper.o fpu_helper.o cc_helper.o int_helper.o svm_helper.o
 obj-y += smm_helper.o misc_helper.o mem_helper.o seg_helper.o
 obj-y += gdbstub.o
 obj-$(CONFIG_SOFTMMU) += machine.o arch_memory_mapping.o arch_dump.o
-obj-$(CONFIG_KVM) += kvm.o hyperv.o
-obj-$(CONFIG_NO_KVM) += kvm-stub.o
+obj-$(CONFIG_KVM) += kvm.o
+obj-$(call lnot,$(CONFIG_KVM)) += kvm-stub.o
 obj-$(CONFIG_LINUX_USER) += ioport-user.o
 obj-$(CONFIG_BSD_USER) += ioport-user.o