commit f8f5cfbaa49387a513fddd9c9bf1aeb0ecc64cce
author Paul Brook <paul@codesourcery.com> Fri Nov 26 21:39:42 2010 +0000
committer Paul Brook <paul@codesourcery.com> Sat Nov 27 00:06:13 2010 +0000
tree 04e44242d6e3bae5d09be64f530b916644cae353
parent bd9141bb2e53195e3c1abf29275365d7f554beb5

PCI config include

Split PCI config options into a separate file

Signed-off-by: Paul Brook <paul@codesourcery.com>

default-configs/arm-softmmu.mak

diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index e7a4e84..ac48dc1 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_LAN9118=y
 CONFIG_SMC91C111=y
 CONFIG_DS1338=y
-CONFIG_VIRTIO_PCI=y
 CONFIG_PFLASH_CFI01=y
 CONFIG_PFLASH_CFI02=y