From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:34605) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TAJBh-00039o-6I for qemu-devel@nongnu.org; Sat, 08 Sep 2012 07:27:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TAJBf-0000xd-0V for qemu-devel@nongnu.org; Sat, 08 Sep 2012 07:26:57 -0400 Received: from hall.aurel32.net ([88.191.126.93]:57341) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TAJBe-0000wP-OY for qemu-devel@nongnu.org; Sat, 08 Sep 2012 07:26:54 -0400 From: Aurelien Jarno Date: Sat, 8 Sep 2012 13:26:16 +0200 Message-Id: <1347103584-20598-5-git-send-email-aurelien@aurel32.net> In-Reply-To: <1347103584-20598-1-git-send-email-aurelien@aurel32.net> References: <1347103584-20598-1-git-send-email-aurelien@aurel32.net> Subject: [Qemu-devel] [PATCH 04/12] mips/malta: use the new pci_vga_init() function List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Aurelien Jarno Signed-off-by: Aurelien Jarno --- hw/mips_malta.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/hw/mips_malta.c b/hw/mips_malta.c index c39dee5..632b466 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) -- 1.7.10.4