Merge remote-tracking branch 'remotes/kraxel/tags/pull-vga-20150615-1' into staging

[qemu.git] / hw / display / vga_int.h

diff --git a/hw/display/vga_int.h b/hw/display/vga_int.h
index fcfcc5f431b69f66016bf01b8b0170dc890a8595..40ba6a4207a5fe6473523ce55a0b1fc866160986 100644 (file)
--- a/hw/display/vga_int.h
+++ b/hw/display/vga_int.h
@@ -219,4 +219,10 @@ extern const uint8_t gr_mask[16];
 
 extern const MemoryRegionOps vga_mem_ops;
 
+/* vga-pci.c */
+void pci_std_vga_mmio_region_init(VGACommonState *s,
+                                  MemoryRegion *parent,
+                                  MemoryRegion *subs,
+                                  bool qext);
+
 #endif