summaryrefslogtreecommitdiff
path: root/default-configs
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2013-02-05 12:55:19 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2013-04-08 18:13:13 +0200
commit34b8f63ea1aa0941f11c6c032f8e1716269a0449 (patch)
tree7eff96e68ac2402f6f95236aea715d75d35ccc63 /default-configs
parent7b2478956a1aece1c79ece8dec250ed91c09903b (diff)
downloadqemu-34b8f63ea1aa0941f11c6c032f8e1716269a0449.tar.gz
hw: move audio devices to hw/audio/, configure via default-configs/
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'default-configs')
-rw-r--r--default-configs/arm-softmmu.mak1
-rw-r--r--default-configs/sparc-softmmu.mak1
2 files changed, 2 insertions, 0 deletions
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 7717ea6672..c0e011084b 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -48,6 +48,7 @@ CONFIG_PL310=y
CONFIG_PL330=y
CONFIG_CADENCE=y
CONFIG_XGMAC=y
+CONFIG_MARVELL_88W8618=y
CONFIG_ONENAND=y
CONFIG_VERSATILE_PCI=y
diff --git a/default-configs/sparc-softmmu.mak b/default-configs/sparc-softmmu.mak
index 6d11ba0369..eda8797662 100644
--- a/default-configs/sparc-softmmu.mak
+++ b/default-configs/sparc-softmmu.mak
@@ -9,3 +9,4 @@ CONFIG_FDC=y
CONFIG_EMPTY_SLOT=y
CONFIG_PCNET_COMMON=y
CONFIG_LANCE=y
+CONFIG_CS4231=y