Module Name: xsrc
Committed By: wiz
Date: Mon Feb 23 12:23:47 UTC 2015
Modified Files:
xsrc/external/mit/xf86-video-mga/dist/src: mga_dac3026.c
Log Message:
Restore part of previous to fix
xf86-video-mga/dist/src/mga_dac3026.c: In function 'MGA3026Save':
xf86-video-mga/dist/src/mga_dac3026.c:856:5: error: passing argument 2 of
'pci_device_cfg_read_u32' from incompatible pointer type [-Werror]
on i386.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-video-mga/dist/src/mga_dac3026.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-mga/dist/src/mga_dac3026.c
diff -u xsrc/external/mit/xf86-video-mga/dist/src/mga_dac3026.c:1.4 xsrc/external/mit/xf86-video-mga/dist/src/mga_dac3026.c:1.5
--- xsrc/external/mit/xf86-video-mga/dist/src/mga_dac3026.c:1.4 Mon Feb 23 10:38:08 2015
+++ xsrc/external/mit/xf86-video-mga/dist/src/mga_dac3026.c Mon Feb 23 12:23:47 2015
@@ -852,8 +852,12 @@ MGA3026Save(ScrnInfoPtr pScrn, vgaRegPtr
mgaReg->DacRegs[i] = inTi3026(MGADACregs[i]);
#ifdef XSERVER_LIBPCIACCESS
- pci_device_cfg_read_u32(pMga->PciInfo, & mgaReg->Option,
+ {
+ uint32_t Option;
+ pci_device_cfg_read_u32(pMga->PciInfo, & Option,
PCI_OPTION_REG);
+ mgaReg->Option = Option;
+ }
#else
mgaReg->Option = pciReadLong(pMga->PciTag, PCI_OPTION_REG);
#endif
