Merge remote-tracking branch 'remotes/borntraeger/tags/s390x-20170714' into staging

[qemu.git] / accel / Makefile.objs

diff --git a/accel/Makefile.objs b/accel/Makefile.objs
index cd5702f3477e4fdd22d26fb21de831ae06c30f58..10666eda714002bc98519b5a12d0decb8708ae46 100644 (file)
--- a/accel/Makefile.objs
+++ b/accel/Makefile.objs
@@ -1,4 +1,4 @@
 obj-$(CONFIG_SOFTMMU) += accel.o
 obj-y += kvm/
-obj-y += tcg/
+obj-$(CONFIG_TCG) += tcg/
 obj-y += stubs/