From: Aurelien Jarno <aurelien@aurel32.net>
Date: Sat, 8 Sep 2012 09:53:12 +0000 (+0200)
Subject: mips/malta: use the new pci_vga_init() function
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=9c59864d16d720184e723c0c29c505c34e94fed5;p=qemu.git

mips/malta: use the new pci_vga_init() function

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
---

diff --git a/hw/mips_malta.c b/hw/mips_malta.c
index c39dee5830..632b466e32 100644
--- a/hw/mips_malta.c
+++ b/hw/mips_malta.c
@@ -33,7 +33,6 @@
 #include "mips.h"
 #include "mips_cpudevs.h"
 #include "pci.h"
-#include "vmware_vga.h"
 #include "qemu-char.h"
 #include "sysemu.h"
 #include "arch_init.h"
@@ -48,7 +47,6 @@
 #include "blockdev.h"
 #include "exec-memory.h"
 #include "sysbus.h"             /* SysBusDevice */
-#include "vga-pci.h"
 
 //#define DEBUG_BOARD_INIT
 
@@ -987,13 +985,7 @@ void mips_malta_init (ram_addr_t ram_size,
     network_init();
 
     /* Optional PCI video card */
-    if (cirrus_vga_enabled) {
-        pci_cirrus_vga_init(pci_bus);
-    } else if (vmsvga_enabled) {
-        pci_vmsvga_init(pci_bus);
-    } else if (std_vga_enabled) {
-        pci_std_vga_init(pci_bus);
-    }
+    pci_vga_init(pci_bus);
 }
 
 static int mips_malta_sysbus_device_init(SysBusDevice *sysbusdev)