Merge remote-tracking branch 'agraf/ppc-for-upstream' into staging

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

diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.mak
index 7c0d3288e37326bcb2410b4a83092c57cc3a3b24..f6bf62d1c22a3f8bd3c904a7e76129e12ddeab12 100644 (file)
--- a/default-configs/sh4-softmmu.mak
+++ b/default-configs/sh4-softmmu.mak
@@ -1,8 +1,11 @@
 # Default configuration for sh4-softmmu
 
-CONFIG_USB_OHCI=y
+include pci.mak
+include usb.mak
 CONFIG_SERIAL=y
 CONFIG_PTIMER=y
-CONFIG_VIRTIO_PCI=y
-CONFIG_IDE_CORE=y
 CONFIG_PFLASH_CFI02=y
+CONFIG_ISA_MMIO=y
+CONFIG_SH4=y
+CONFIG_IDE_MMIO=y
+CONFIG_SM501=y