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 /hw/mips_malta.c | |
| parent | 1abeb5a65d515f8a8a9cfc4a82342f731bd9321f (diff) | |
| parent | 09fa35e5cdc7d17ed3e1528ca743893ae77a0ea2 (diff) | |
Merge remote branch 'origin/master' into pci
Conflicts:
Makefile.objs
hw/virtio.c
Diffstat (limited to 'hw/mips_malta.c')
| -rw-r--r-- | hw/mips_malta.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/mips_malta.c b/hw/mips_malta.c index 80260714ec..6be8aa70f9 100644 --- a/hw/mips_malta.c +++ b/hw/mips_malta.c @@ -977,7 +977,7 @@ void mips_malta_init (ram_addr_t ram_size, } else if (vmsvga_enabled) { pci_vmsvga_init(pci_bus); } else if (std_vga_enabled) { - pci_vga_init(pci_bus, 0, 0); + pci_vga_init(pci_bus); } } |