From 03837aa491743493523c6e8208a079791ddda5c0 Mon Sep 17 00:00:00 2001
From: Peter Veenstra <qbix79@users.sourceforge.net>
Date: Thu, 22 Feb 2007 08:48:19 +0000
Subject: [PATCH] commit the header as well

Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@2820
---
 include/vga.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/include/vga.h b/include/vga.h
index 0c6fb456..07736551 100644
--- a/include/vga.h
+++ b/include/vga.h
@@ -106,13 +106,11 @@ typedef struct {
 	Bitu width;
 	Bitu height;
 	Bitu blocks;
-	Bitu panning;
 	Bitu address;
 	Bit8u *linear_base;
 	Bitu linear_mask;
-	Bitu address_mask;
-	Bitu address_last;
 	Bitu address_add;
+	Bitu line_length;
 	Bitu address_line_total;
 	Bitu address_line;
 	Bitu lines_total;
@@ -316,6 +314,7 @@ typedef struct {
 	Bit8u write_index;
 	Bit8u read_index;
 	Bitu first_changed;
+	Bit8u combine[16];
 	RGBEntry rgb[0x100];
 } VGA_Dac;
 
@@ -338,7 +337,6 @@ typedef struct {
 	Bit8u	map[(VGA_MEMORY >> VGA_CHANGE_SHIFT) + 32];
 	Bit8u	checkMask, frame, writeMask;
 	bool	active;
-	Bit32u	lineWidth;
 	Bit32u  clearMask;
 	Bit32u	start, last;
 	Bit32u	lastAddress;