summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2009-12-07 11:21:03 +0200
committerAvi Kivity <avi@redhat.com>2009-12-07 11:21:03 +0200
commit1489be9ae993c7687d194735bb952c1add4a1a1b (patch)
treedebe94732ee95eb59ae8b89701473b38df7e9ab7 /Makefile.target
parentMerge commit '6b02494d64a15476e26a6e8468623d01c4c75c58' into upstream-merge (diff)
parentAdd S390x virtio machine bus (diff)
downloadqemu-kvm-1489be9ae993c7687d194735bb952c1add4a1a1b.tar.gz
qemu-kvm-1489be9ae993c7687d194735bb952c1add4a1a1b.tar.bz2
qemu-kvm-1489be9ae993c7687d194735bb952c1add4a1a1b.zip
Merge commit 'f3304eea9338b7e694843fa1a6db5540e8783d1d' into upstream-merge
* commit 'f3304eea9338b7e694843fa1a6db5540e8783d1d': Add S390x virtio machine bus Add support for S390x system emulation Conflicts: Makefile.target Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'Makefile.target')
-rw-r--r--Makefile.target2
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile.target b/Makefile.target
index 9dabe15cc..a69089e59 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -321,6 +321,8 @@ obj-sh4-y += ide/core.o ide/mmio.o
obj-m68k-y = an5206.o mcf5206.o mcf_uart.o mcf_intc.o mcf5208.o mcf_fec.o
obj-m68k-y += m68k-semi.o dummy_m68k.o
+obj-s390x-y = s390-virtio-bus.o
+
ifeq ($(TARGET_ARCH), ia64)
firmware.o: firmware.c
$(CC) $(HELPER_CFLAGS) $(CPPFLAGS) $(BASE_CFLAGS) -c -o $@ $<