mirror of
https://github.com/X11Libre/xserver.git
synced 2026-10-10 23:33:46 +00:00
Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/xorg/xserver into pci-rework
Conflicts: hw/xfree86/common/xf86Configure.c hw/xfree86/common/xf86Helper.c hw/xfree86/common/xf86pciBus.c hw/xfree86/int10/helper_exec.c hw/xfree86/os-support/bus/Pci.c hw/xfree86/os-support/bus/linuxPci.c hw/xfree86/os-support/linux/lnx_pci.c hw/xfree86/scanpci/Makefile.am hw/xfree86/utils/pcitweak/Makefile.am hw/xfree86/utils/scanpci/Makefile.am
This commit is contained in:
commit
e1f73d2208
370 changed files with 17254 additions and 46136 deletions
|
|
@ -223,6 +223,7 @@ typedef struct {
|
|||
pointer options;
|
||||
pointer DDC;
|
||||
Bool reducedblanking; /* Allow CVT reduced blanking modes? */
|
||||
int maxPixClock; /* in kHz, like mode->Clock */
|
||||
} MonRec, *MonPtr;
|
||||
|
||||
/* the list of clock ranges */
|
||||
|
|
|
|||
Loading…
Reference in a new issue