Merge remote-tracking branch 'kwolf/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 6eb8b3227f3dd51a69f5d39f0ccfc6c899fa5d20..233a8564ebc4b74ecf38f3180cc6bbaa3f6b30cd 100644 (file)
--- a/default-configs/x86_64-softmmu.mak
+++ b/default-configs/x86_64-softmmu.mak
@@ -1,5 +1,27 @@
 # Default configuration for x86_64-softmmu
 
-CONFIG_USB_OHCI=y
+include pci.mak
+CONFIG_VGA=y
 CONFIG_VGA_PCI=y
+CONFIG_VGA_ISA=y
+CONFIG_VGA_CIRRUS=y
+CONFIG_VMWARE_VGA=y
+CONFIG_VMMOUSE=y
+CONFIG_SERIAL=y
 CONFIG_PARALLEL=y
+CONFIG_I8254=y
+CONFIG_PCSPK=y
+CONFIG_PCKBD=y
+CONFIG_FDC=y
+CONFIG_ACPI=y
+CONFIG_APM=y
+CONFIG_DMA=y
+CONFIG_IDE_ISA=y
+CONFIG_IDE_PIIX=y
+CONFIG_NE2000_ISA=y
+CONFIG_PIIX_PCI=y
+CONFIG_SOUND=y
+CONFIG_HPET=y
+CONFIG_APPLESMC=y
+CONFIG_I8259=y
+CONFIG_PFLASH_CFI01=y