aboutsummaryrefslogtreecommitdiff
path: root/x11-drivers/xf86-video-mga/files/patch-src_mga__driver.c
diff options
context:
space:
mode:
Diffstat (limited to 'x11-drivers/xf86-video-mga/files/patch-src_mga__driver.c')
-rw-r--r--x11-drivers/xf86-video-mga/files/patch-src_mga__driver.c23
1 files changed, 23 insertions, 0 deletions
diff --git a/x11-drivers/xf86-video-mga/files/patch-src_mga__driver.c b/x11-drivers/xf86-video-mga/files/patch-src_mga__driver.c
new file mode 100644
index 000000000000..4c2b73f8d464
--- /dev/null
+++ b/x11-drivers/xf86-video-mga/files/patch-src_mga__driver.c
@@ -0,0 +1,23 @@
+# Correct a string that should be const
+# Cast away a warning as done earlier in the same function
+#
+--- src/mga_driver.c.orig 2017-01-17 22:40:29 UTC
++++ src/mga_driver.c
+@@ -1933,7 +1933,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
+ } else {
+ int from = X_DEFAULT;
+ #ifdef USE_EXA
+- char *s = xf86GetOptValString(pMga->Options, OPTION_ACCELMETHOD);
++ const char *s = xf86GetOptValString(pMga->Options, OPTION_ACCELMETHOD);
+ #endif
+ pMga->NoAccel = FALSE;
+ pMga->Exa = FALSE;
+@@ -2644,7 +2644,7 @@ MGAMapMem(ScrnInfoPtr pScrn)
+ err = pci_device_map_range(dev,
+ region->base_addr, region->size,
+ PCI_DEV_MAP_FLAG_WRITABLE,
+- &pMga->IOBase);
++ (void **)&pMga->IOBase);
+
+ if (err) {
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR,