aboutsummaryrefslogtreecommitdiff
path: root/default-configs
diff options
context:
space:
mode:
Diffstat (limited to 'default-configs')
-rw-r--r--default-configs/i386-softmmu.mak2
-rw-r--r--default-configs/mips-softmmu-common.mak2
-rw-r--r--default-configs/ppc-softmmu.mak2
-rw-r--r--default-configs/sound.mak4
4 files changed, 3 insertions, 7 deletions
diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak
index 80c4b49eb0..db841b6885 100644
--- a/default-configs/i386-softmmu.mak
+++ b/default-configs/i386-softmmu.mak
@@ -2,7 +2,7 @@
CONFIG_PCI=y
CONFIG_PCI_DEVICES=y
-include sound.mak
+CONFIG_ISA_BUS=y
include usb.mak
include hyperv.mak
CONFIG_TEST_DEVICES=y
diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips-softmmu-common.mak
index 88f28e5040..4a489604eb 100644
--- a/default-configs/mips-softmmu-common.mak
+++ b/default-configs/mips-softmmu-common.mak
@@ -1,7 +1,7 @@
# Common mips*-softmmu CONFIG defines
-include sound.mak
include usb.mak
+CONFIG_ISA_BUS=y
CONFIG_PCI=y
CONFIG_PCI_DEVICES=y
CONFIG_ESP=y
diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak
index f47c06916f..f1d06f43fc 100644
--- a/default-configs/ppc-softmmu.mak
+++ b/default-configs/ppc-softmmu.mak
@@ -1,7 +1,7 @@
# Default configuration for ppc-softmmu
-include sound.mak
include usb.mak
+CONFIG_ISA_BUS=y
CONFIG_PCI=y
CONFIG_PCI_DEVICES=y
CONFIG_TEST_DEVICES=y
diff --git a/default-configs/sound.mak b/default-configs/sound.mak
deleted file mode 100644
index 4f22c34b5d..0000000000
--- a/default-configs/sound.mak
+++ /dev/null
@@ -1,4 +0,0 @@
-CONFIG_SB16=y
-CONFIG_ADLIB=y
-CONFIG_GUS=y
-CONFIG_CS4231A=y