summaryrefslogtreecommitdiff
path: root/src/radeon_probe.h
diff options
context:
space:
mode:
authorEric Anholt <anholt@freebsd.org>2004-06-16 09:22:56 +0000
committerEric Anholt <anholt@freebsd.org>2004-06-16 09:22:56 +0000
commit6cbb5bbff43d65a762d432659793333868837f0b (patch)
tree3a81f83b12ee7774bea68e1c0d9cfd444deef207 /src/radeon_probe.h
parent3586c3c7955365a2af0b8a286ea0d0488ddfd137 (diff)
DRI XFree86-4_3_99_12-merge importDRI-XFree86-4_3_99_12-merge
Diffstat (limited to 'src/radeon_probe.h')
-rw-r--r--src/radeon_probe.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/radeon_probe.h b/src/radeon_probe.h
index af32f252..77d7e86c 100644
--- a/src/radeon_probe.h
+++ b/src/radeon_probe.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.h,v 1.13 2003/10/30 17:37:00 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.h,v 1.11 2003/07/02 17:31:30 martin Exp $ */
/*
* Copyright 2000 ATI Technologies Inc., Markham, Ontario, and
* VA Linux Systems Inc., Fremont, California.
@@ -60,9 +60,9 @@ typedef struct
ScrnInfoPtr pPrimaryScrn;
int MonType1;
- int MonType2;
+ int MonType2;
xf86MonPtr MonInfo1;
- xf86MonPtr MonInfo2;
+ xf86MonPtr MonInfo2;
Bool ReversedDAC; /* TVDAC used as primary dac */
Bool ReversedTMDS; /* DDC_DVI is used for external TMDS */
} RADEONEntRec, *RADEONEntPtr;
@@ -100,7 +100,7 @@ extern void RADEONLeaveVT
FunctionPrototype((int, int));
extern void RADEONFreeScreen
FunctionPrototype((int, int));
-extern ModeStatus RADEONValidMode
+extern int RADEONValidMode
FunctionPrototype((int, DisplayModePtr, Bool,
int));