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

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

diff --git a/default-configs/sh4eb-softmmu.mak b/default-configs/sh4eb-softmmu.mak
index 5b8a16eea21a8f1be06d0b3a418921f62f1abe1b..c1d513d099becb76ab5fb1958fce75a19c846a2a 100644 (file)
--- a/default-configs/sh4eb-softmmu.mak
+++ b/default-configs/sh4eb-softmmu.mak
@@ -1,8 +1,11 @@
 # Default configuration for sh4eb-softmmu
 
 include pci.mak
+include usb.mak
 CONFIG_SERIAL=y
 CONFIG_PTIMER=y
-CONFIG_IDE_CORE=y
 CONFIG_PFLASH_CFI02=y
 CONFIG_ISA_MMIO=y
+CONFIG_SH4=y
+CONFIG_IDE_MMIO=y
+CONFIG_SM501=y