diff options
| author | Ian Romanick <idr@umwelt.(none)> | 2006-07-31 09:26:04 -0700 |
|---|---|---|
| committer | Ian Romanick <idr@umwelt.(none)> | 2006-07-31 09:26:04 -0700 |
| commit | 69533fc04f38c67fd424776c5191a4ba57ba8c8f (patch) | |
| tree | b260e1e2a35c02fee21d93e1dcd119cde15589f0 /hw/xfree86/common/xf86.h | |
| parent | ef1aecaaf6cd7e9e4f9d0c6373664e774500bc13 (diff) | |
| parent | 24051ef97406f28c102cf46a78223400b61fdae2 (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
Conflicts:
hw/xfree86/Makefile.am
hw/xfree86/common/xf86AutoConfig.c
Diffstat (limited to 'hw/xfree86/common/xf86.h')
| -rw-r--r-- | hw/xfree86/common/xf86.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h index ad67b7c8d..dc210cb7f 100644 --- a/hw/xfree86/common/xf86.h +++ b/hw/xfree86/common/xf86.h @@ -187,6 +187,10 @@ void *xf86GetPointerScreenFuncs(void); void xf86InitOrigins(void); void xf86ReconfigureLayout(void); +/* xf86cvt.c */ +DisplayModePtr xf86CVTMode(int HDisplay, int VDisplay, float VRefresh, + Bool Reduced, Bool Interlaced); + /* xf86DPMS.c */ Bool xf86DPMSInit(ScreenPtr pScreen, DPMSSetProcPtr set, int flags); |