Module Name: xsrc Committed By: mrg Date: Sat Aug 20 19:49:51 UTC 2016
Modified Files: xsrc/external/mit/xf86-video-chips/dist/src: ct_driver.c Log Message: fix the merge botch fix properly. fixes shark builds. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 \ 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.19 xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c:1.20 --- xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c:1.19 Fri Aug 19 23:46:45 2016 +++ xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c Sat Aug 20 19:49:51 2016 @@ -96,11 +96,6 @@ /* All drivers initialising the SW cursor need this */ #include "mipointer.h" -/* All drivers using the mi banking wrapper need this */ -#ifdef HAVE_ISA -#include "mibank.h" -#endif - /* All drivers using the mi colormap manipulation need this */ #include "micmap.h"