summaryrefslogtreecommitdiff
path: root/src/i830.h
diff options
context:
space:
mode:
authorAlexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>2004-03-17 20:30:42 +0000
committerAlexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>2004-03-17 20:30:42 +0000
commit25be4f99b4d3aa328177584df9808a23fabe74f4 (patch)
tree44a767546075981208dcfb359d73ea27c073a7fd /src/i830.h
parent46bac6d7ad1c5be6b98f8646bcb4eed5aa93e469 (diff)
merge with XORG-RELEASE-1 (tag XORG-CYGWIN-LAST-MERGE)CYGWIN-RELEASE-1-MERGE
Diffstat (limited to 'src/i830.h')
-rw-r--r--src/i830.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/i830.h b/src/i830.h
index 6b1efa49..143df120 100644
--- a/src/i830.h
+++ b/src/i830.h
@@ -27,7 +27,7 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
**************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i830.h,v 1.11 2003/10/21 04:13:40 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i830.h,v 1.12 2004/01/07 03:43:19 dawes Exp $ */
/*
* Authors:
@@ -302,6 +302,8 @@ typedef struct _I830Rec {
int yoffset;
int SaveGeneration;
+ Bool vbeRestoreWorkaround;
+ Bool displayInfo;
} I830Rec;
#define I830PTR(p) ((I830Ptr)((p)->driverPrivate))