Module Name: xsrc
Committed By: mrg
Date: Wed Aug 3 01:30:42 UTC 2011
Modified Files:
xsrc/external/mit/xf86-video-chips/dist/src: ct_driver.c
Log Message:
revert a bad merge with chips 1.2.4. now this builds with 1.10 like
the upstream does.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
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.11 xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c:1.12
--- xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c:1.11 Tue Jul 26 04:48:24 2011
+++ xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c Wed Aug 3 01:30:42 2011
@@ -128,8 +128,6 @@
#include "xf4bpp.h"
#endif
-#include "hw/xfree86/xf8_16bpp/cfb8_16.h"
-
/* int10 */
#include "xf86int10.h"
#include "vbe.h"
@@ -3823,7 +3821,7 @@
}
static Bool
-local_cfb8_16ScreenInit(ScreenPtr pScreen, pointer pbits16, pointer pbits8,
+cfb8_16ScreenInit(ScreenPtr pScreen, pointer pbits16, pointer pbits8,
int xsize, int ysize, int dpix, int dpiy,
int width16, int width8)
{
@@ -4018,7 +4016,7 @@
#endif
case 16:
if (cPtr->Flags & ChipsOverlay8plus16) {
- ret = local_cfb8_16ScreenInit(pScreen, (unsigned char *)FBStart +
+ ret = cfb8_16ScreenInit(pScreen, (unsigned char *)FBStart +
cPtr->FbOffset16, FBStart, width,
height, pScrn->xDpi, pScrn->yDpi,
displayWidth, displayWidth);
