Merge remote branch 'mst/for_anthony' into staging

[qemu.git] / default-configs / x86_64-softmmu.mak

diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak
index 92061de42f201b5965c9ec8de6063c4014f3f0f3..6662b9456b28265a4f1ec793492432a4241807c7 100644 (file)
--- a/default-configs/x86_64-softmmu.mak
+++ b/default-configs/x86_64-softmmu.mak
@@ -2,5 +2,21 @@
 
 CONFIG_USB_OHCI=y
 CONFIG_VGA_PCI=y
+CONFIG_VGA_ISA=y
+CONFIG_VMWARE_VGA=y
+CONFIG_SERIAL=y
 CONFIG_PARALLEL=y
 CONFIG_I8254=y
+CONFIG_PCSPK=y
+CONFIG_USB_UHCI=y
+CONFIG_FDC=y
+CONFIG_ACPI=y
+CONFIG_IDE_CORE=y
+CONFIG_IDE_QDEV=y
+CONFIG_IDE_PCI=y
+CONFIG_IDE_ISA=y
+CONFIG_IDE_PIIX=y
+CONFIG_NE2000_ISA=y
+CONFIG_PIIX_PCI=y
+CONFIG_SOUND=y
+CONFIG_VIRTIO_PCI=y