Module Name: xsrc
Committed By: mrg
Date: Fri Aug 19 23:46:45 UTC 2016
Modified Files:
xsrc/external/mit/xf86-video-chips/dist/src: ct_driver.c
Log Message:
fix merge botch in previous
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 \
xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.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-chips/dist/src/ct_driver.c
diff -u xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c:1.18 xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c:1.19
--- xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c:1.18 Fri Aug 19 23:30:29 2016
+++ xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c Fri Aug 19 23:46:45 2016
@@ -100,7 +100,6 @@
#ifdef HAVE_ISA
#include "mibank.h"
#endif
-#endif
/* All drivers using the mi colormap manipulation need this */
#include "micmap.h"
