summaryrefslogtreecommitdiff
path: root/src/radeon_probe.h
diff options
context:
space:
mode:
authorAlex Deucher <alex@t41p.hsd1.va.comcast.net>2007-05-08 18:41:25 +0200
committerAlex Deucher <alex@t41p.hsd1.va.comcast.net>2007-05-08 18:41:25 +0200
commit76670f665ebec7cdf40a04bf9379cb3ad4417507 (patch)
treed108b86148b961e95ab44879f3eb024e5dfe5977 /src/radeon_probe.h
parent83f81ed5e3c33c94c80500316c37a7cbfc51f41f (diff)
parenta3ee42207aab77d93655a82fdcb32be38268b85f (diff)
Merge branch 'master' into randr-1.2 and fix conflicts
Diffstat (limited to 'src/radeon_probe.h')
-rw-r--r--src/radeon_probe.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/radeon_probe.h b/src/radeon_probe.h
index c783460..cbe9e74 100644
--- a/src/radeon_probe.h
+++ b/src/radeon_probe.h
@@ -51,7 +51,8 @@ typedef enum
DDC_MONID,
DDC_DVI,
DDC_VGA,
- DDC_CRT2
+ DDC_CRT2,
+ DDC_LCD,
} RADEONDDCType;
typedef enum
@@ -187,6 +188,4 @@ extern ModeStatus RADEONValidMode(int, DisplayModePtr, Bool, int);
extern const OptionInfoRec *RADEONOptionsWeak(void);
-extern void RADEONFillInScreenInfo(ScrnInfoPtr);
-
#endif /* _RADEON_PROBE_H_ */