diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2010-12-01 07:11:51 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2010-12-01 07:11:51 +0200 |
| commit | c924f36a300cbc54d3cb511116e8e2bae17f5ae6 (patch) | |
| tree | 04e57676b1db1db7d8b33934b349f8f37780fa2a /default-configs/mipsel-softmmu.mak | |
| parent | 1abeb5a65d515f8a8a9cfc4a82342f731bd9321f (diff) | |
| parent | 09fa35e5cdc7d17ed3e1528ca743893ae77a0ea2 (diff) | |
Merge remote branch 'origin/master' into pci
Conflicts:
Makefile.objs
hw/virtio.c
Diffstat (limited to 'default-configs/mipsel-softmmu.mak')
| -rw-r--r-- | default-configs/mipsel-softmmu.mak | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/default-configs/mipsel-softmmu.mak b/default-configs/mipsel-softmmu.mak index 238b73ace1..92fc473318 100644 --- a/default-configs/mipsel-softmmu.mak +++ b/default-configs/mipsel-softmmu.mak @@ -1,5 +1,6 @@ # Default configuration for mipsel-softmmu +include pci.mak CONFIG_ISA_MMIO=y CONFIG_ESP=y CONFIG_VGA_PCI=y @@ -11,7 +12,6 @@ CONFIG_PARALLEL=y CONFIG_I8254=y CONFIG_PCSPK=y CONFIG_PCKBD=y -CONFIG_USB_UHCI=y CONFIG_FDC=y CONFIG_ACPI=y CONFIG_APM=y @@ -24,7 +24,6 @@ CONFIG_IDE_ISA=y CONFIG_IDE_PIIX=y CONFIG_NE2000_ISA=y CONFIG_SOUND=y -CONFIG_VIRTIO_PCI=y CONFIG_RC4030=y CONFIG_DP8393X=y CONFIG_DS1225Y=y |