qdev-properties-system.c: Allow vlan or netdev for -device, not both

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

diff --git a/default-configs/sparc-softmmu.mak b/default-configs/sparc-softmmu.mak
index 1b94dcead153954b1094830e271b7210d89b3f34..8fc93dd643322961649a1f6d4fd8531c62bf4f0a 100644 (file)
--- a/default-configs/sparc-softmmu.mak
+++ b/default-configs/sparc-softmmu.mak
@@ -1,10 +1,18 @@
 # Default configuration for sparc-softmmu
 
-CONFIG_QDEV_ADDR=y
 CONFIG_ECC=y
 CONFIG_ESP=y
 CONFIG_ESCC=y
 CONFIG_M48T59=y
 CONFIG_PTIMER=y
 CONFIG_FDC=y
-CONFIG_VIRTIO_PCI=y
+CONFIG_EMPTY_SLOT=y
+CONFIG_PCNET_COMMON=y
+CONFIG_LANCE=y
+CONFIG_TCX=y
+CONFIG_SLAVIO=y
+CONFIG_CS4231=y
+CONFIG_GRLIB=y
+CONFIG_STP2000=y
+CONFIG_ECCMEMCTL=y
+CONFIG_SUN4M=y