summaryrefslogtreecommitdiff
path: root/src/i830.h
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2004-02-23 21:35:30 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2004-02-23 21:35:30 +0000
commit71687eeaa94c5b1ce1fbb11ff27d4e69c73a4a1d (patch)
treecca7300580523a9ef1b66009aea0f96ea1cc5248 /src/i830.h
parent775f4085e0939561304642567ae0395f8a2f534d (diff)
merge most of XFree86 RC3 (4.3.99.903) from vendor branch.XORG-RELEASE-1-BASEXEVIE-MERGEXINERAMA_2
bug #214
Diffstat (limited to 'src/i830.h')
-rw-r--r--src/i830.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/i830.h b/src/i830.h
index 6b1efa49..75ae7663 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,7 @@ typedef struct _I830Rec {
int yoffset;
int SaveGeneration;
+ Bool vbeRestoreWorkaround;
} I830Rec;
#define I830PTR(p) ((I830Ptr)((p)->driverPrivate))