Module Name: xsrc
Committed By: wiz
Date: Mon Feb 23 10:38:08 UTC 2015
Modified Files:
xsrc/external/mit/xf86-video-mga/dist/src: mga_dac3026.c mga_vga.c
Log Message:
Remove unneeded diffs to upstream.
Tested with gcc and clang on amd64.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-mga/dist/src/mga_dac3026.c \
xsrc/external/mit/xf86-video-mga/dist/src/mga_vga.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.3 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.3 Sun Jun 2 08:29:33 2013
+++ xsrc/external/mit/xf86-video-mga/dist/src/mga_dac3026.c Mon Feb 23 10:38:08 2015
@@ -727,7 +727,7 @@ MGA3026Restore(ScrnInfoPtr pScrn, vgaReg
OUTREG16(0x1FDE, (mgaReg->ExtVga[i] << 8) | i);
#ifdef XSERVER_LIBPCIACCESS
- pci_device_cfg_write_bits(pMga->PciInfo, OPTION_MASK, (uint32_t)mgaReg->Option,
+ pci_device_cfg_write_bits(pMga->PciInfo, OPTION_MASK, mgaReg->Option,
PCI_OPTION_REG);
#else
pciSetBitsLong(pMga->PciTag, PCI_OPTION_REG, OPTION_MASK,
@@ -852,12 +852,8 @@ MGA3026Save(ScrnInfoPtr pScrn, vgaRegPtr
mgaReg->DacRegs[i] = inTi3026(MGADACregs[i]);
#ifdef XSERVER_LIBPCIACCESS
- {
- uint32_t Option;
- pci_device_cfg_read_u32(pMga->PciInfo, & Option,
+ pci_device_cfg_read_u32(pMga->PciInfo, & mgaReg->Option,
PCI_OPTION_REG);
- mgaReg->Option = Option;
- }
#else
mgaReg->Option = pciReadLong(pMga->PciTag, PCI_OPTION_REG);
#endif
Index: xsrc/external/mit/xf86-video-mga/dist/src/mga_vga.c
diff -u xsrc/external/mit/xf86-video-mga/dist/src/mga_vga.c:1.3 xsrc/external/mit/xf86-video-mga/dist/src/mga_vga.c:1.4
--- xsrc/external/mit/xf86-video-mga/dist/src/mga_vga.c:1.3 Sun Jun 2 08:29:33 2013
+++ xsrc/external/mit/xf86-video-mga/dist/src/mga_vga.c Mon Feb 23 10:38:08 2015
@@ -7,7 +7,6 @@
#include "misc.h"
#include "xf86.h"
#include "xf86_OSproc.h"
-#include <X11/Xos.h>
#include "vgaHW.h"
#include "compiler.h"
#include "xf86cmap.h"
