Merge remote-tracking branch 'stefanha/net' into staging

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

diff --git a/default-configs/cris-softmmu.mak b/default-configs/cris-softmmu.mak
index c429979072da80e854ad4b4b03cf7f3a0f3620c2..d970d50158b7429f6209f9d4b71db3e730424545 100644 (file)
--- a/default-configs/cris-softmmu.mak
+++ b/default-configs/cris-softmmu.mak
@@ -1,3 +1,6 @@
 # Default configuration for cris-softmmu
 
+CONFIG_ETRAXFS=y
 CONFIG_NAND=y
+CONFIG_PTIMER=y
+CONFIG_PFLASH_CFI02=y