From 3586c3c7955365a2af0b8a286ea0d0488ddfd137 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.de>
Date: Fri, 23 Apr 2004 19:26:46 +0000
Subject: Merging XORG-CURRENT into trunk

---
 src/atistruct.h | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'src/atistruct.h')

diff --git a/src/atistruct.h b/src/atistruct.h
index 3f34b147..a80c8b43 100644
--- a/src/atistruct.h
+++ b/src/atistruct.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atistruct.h,v 1.43 2004/03/11 15:19:18 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atistruct.h,v 1.41tsi Exp $ */
 /*
  * Copyright 1999 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
  *
@@ -406,25 +406,25 @@ typedef struct _ATIRec
     /*
      * Driver options.
      */
-    unsigned int OptionAccel:1;        /* Use hardware draw engine */
-    unsigned int OptionBIOSDisplay:1;  /* Allow BIOS interference */
-    unsigned int OptionBlend:1;        /* Force horizontal blending */
-    unsigned int OptionCRTDisplay:1;   /* Display on both CRT & DFP */
-    unsigned int OptionCSync:1;        /* Use composite sync */
-    unsigned int OptionDevel:1;        /* Intentionally undocumented */
+    CARD8 OptionAccel:1;        /* Use hardware draw engine */
+    CARD8 OptionBIOSDisplay:1;  /* Allow BIOS interference */
+    CARD8 OptionBlend:1;        /* Force horizontal blending */
+    CARD8 OptionCRTDisplay:1;   /* Display on both CRT and digital panel */
+    CARD8 OptionCSync:1;        /* Use composite sync */
+    CARD8 OptionDevel:1;        /* Intentionally undocumented */
 
 #ifndef AVOID_CPIO
 
-    unsigned int OptionLinear:1;       /* Use linear aperture if available */
+    CARD8 OptionLinear:1;       /* Use linear fb aperture when available */
 
 #endif /* AVOID_CPIO */
 
-    unsigned int OptionMMIOCache:1;    /* Cache MMIO writes */
-    unsigned int OptionTestMMIOCache:1;/* Test MMIO cache integrity */
-    unsigned int OptionPanelDisplay:1; /* Prefer digital panel over CRT */
-    unsigned int OptionProbeClocks:1;  /* Force probe for fixed clocks */
-    unsigned int OptionShadowFB:1;     /* Use shadow frame buffer */
-    unsigned int OptionLCDSync:1;      /* Temporary */
+    CARD8 OptionMMIOCache:1;    /* Cache MMIO writes */
+    CARD8 OptionTestMMIOCache:1;/* Test MMIO cache integrity */
+    CARD8 OptionPanelDisplay:1; /* Prefer digital panel over CRT */
+    CARD8 OptionProbeClocks:1;  /* Force probe for fixed clocks */
+    CARD8 OptionShadowFB:1;     /* Use shadow frame buffer */
+    CARD8 OptionLCDSync:1;      /* Temporary */
 
     /*
      * State flags.
-- 
cgit v1.2.3