diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-10-14 10:44:52 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-10-14 10:44:52 -0500 |
| commit | 36f490b176afab3096e9c2877b365354f67e269d (patch) | |
| tree | b99964fa0e30e9a7931c4944cd1897f8f735aee3 /Makefile.target | |
| parent | ebffe2afceb1a17b5d134b5debf553955fe5ea1a (diff) | |
| parent | 0d9595245393f6e59831447a06235a0a1b2cdfd4 (diff) | |
| download | qemu-36f490b176afab3096e9c2877b365354f67e269d.zip qemu-36f490b176afab3096e9c2877b365354f67e269d.tar.gz qemu-36f490b176afab3096e9c2877b365354f67e269d.tar.bz2 | |
Merge remote-tracking branch 'qemu-kvm-tmp/memory/batch' into staging
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 42adfec..c22b3cb 100644 --- a/Makefile.target +++ b/Makefile.target @@ -183,7 +183,7 @@ endif #CONFIG_BSD_USER # System emulator target ifdef CONFIG_SOFTMMU -obj-y = arch_init.o cpus.o monitor.o machine.o gdbstub.o balloon.o +obj-y = arch_init.o cpus.o monitor.o machine.o gdbstub.o balloon.o ioport.o # virtio has to be here due to weird dependency between PCI and virtio-net. # need to fix this properly obj-$(CONFIG_NO_PCI) += pci-stub.o |