diff options
| author |   Avi Kivity <avi@redhat.com> | 2009-12-07 11:22:32 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-12-07 11:22:32 +0200 |
| commit | d95f05082bb2b6a695784f006f21d14547177786 (patch) | |
| tree | ac8653f87582c7328a65e3edef6a8e05e6bfef43 /Makefile.target | |
| parent | Merge commit 'f3304eea9338b7e694843fa1a6db5540e8783d1d' into upstream-merge (diff) | |
| parent | Add S390 maintainer information (diff) | |
| download | qemu-kvm-d95f05082bb2b6a695784f006f21d14547177786.tar.gz qemu-kvm-d95f05082bb2b6a695784f006f21d14547177786.tar.bz2 qemu-kvm-d95f05082bb2b6a695784f006f21d14547177786.zip | |
Merge commit '749717a0ea2f60d33d01c1e37fa24dfa7250dfc0' into upstream-merge
* commit '749717a0ea2f60d33d01c1e37fa24dfa7250dfc0':
Add S390 maintainer information
Set default console to virtio on S390x
S390 GDB stub
Add S390x virtio machine description
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'Makefile.target')
| -rw-r--r-- | Makefile.target | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.target b/Makefile.target index a69089e59..b3a54ca18 100644 --- a/Makefile.target +++ b/Makefile.target @@ -321,7 +321,7 @@ 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 +obj-s390x-y = s390-virtio-bus.o s390-virtio.o ifeq ($(TARGET_ARCH), ia64) firmware.o: firmware.c |