From: Ian Jackson <iwj@mariner.uk.xensource.com>
Date: Thu, 29 May 2008 15:57:15 +0000 (+0100)
Subject: disable if CONFIG_DM
X-Git-Tag: xen-3.3.0-rc1~153
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=744c1a682ec4fa1fa2eda965fc09a7741b204dfc;p=qemu-xen-4.5-testing.git

disable if CONFIG_DM
---

diff --git a/hw/vmware_vga.c b/hw/vmware_vga.c
index 2f9b15ccd..ddeec325e 100644
--- a/hw/vmware_vga.c
+++ b/hw/vmware_vga.c
@@ -25,6 +25,8 @@
 #include "console.h"
 #include "pci.h"
 
+#ifndef CONFIG_DM
+
 #define VERBOSE
 #define EMBED_STDVGA
 #undef DIRECT_VRAM
@@ -1246,3 +1248,9 @@ void pci_vmsvga_init(PCIBus *bus, DisplayState *ds, uint8_t *vga_ram_base,
 
     register_savevm("vmware_vga", 0, 0, pci_vmsvga_save, pci_vmsvga_load, s);
 }
+
+#else /*CONFIG_DM*/
+void pci_vmsvga_init(PCIBus *bus, DisplayState *ds, uint8_t *vga_ram_base,
+                     unsigned long vga_ram_offset, int vga_ram_size) {
+}
+#endif