summaryrefslogtreecommitdiff
path: root/default-configs/arm-softmmu.mak
diff options
context:
space:
mode:
authorPaul Brook <paul@codesourcery.com>2010-11-26 21:39:42 +0000
committerPaul Brook <paul@codesourcery.com>2010-11-27 00:06:13 +0000
commitf8f5cfbaa49387a513fddd9c9bf1aeb0ecc64cce (patch)
tree04e44242d6e3bae5d09be64f530b916644cae353 /default-configs/arm-softmmu.mak
parentbd9141bb2e53195e3c1abf29275365d7f554beb5 (diff)
downloadqemu-f8f5cfbaa49387a513fddd9c9bf1aeb0ecc64cce.tar.gz
qemu-f8f5cfbaa49387a513fddd9c9bf1aeb0ecc64cce.tar.bz2
qemu-f8f5cfbaa49387a513fddd9c9bf1aeb0ecc64cce.zip
PCI config include
Split PCI config options into a separate file Signed-off-by: Paul Brook <paul@codesourcery.com>
Diffstat (limited to 'default-configs/arm-softmmu.mak')
-rw-r--r--default-configs/arm-softmmu.mak3
1 files changed, 1 insertions, 2 deletions
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index e7a4e84481..ac48dc1565 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -1,7 +1,7 @@
# Default configuration for arm-softmmu
+include pci.mak
CONFIG_GDBSTUB_XML=y
-CONFIG_USB_OHCI=y
CONFIG_ISA_MMIO=y
CONFIG_NAND=y
CONFIG_ECC=y
@@ -25,6 +25,5 @@ CONFIG_SSI_SD=y
CONFIG_LAN9118=y
CONFIG_SMC91C111=y
CONFIG_DS1338=y
-CONFIG_VIRTIO_PCI=y
CONFIG_PFLASH_CFI01=y
CONFIG_PFLASH_CFI02=y