[xsrc/trunk]: xsrc/external/mit/xf86-video-r128/dist/src fix merge botch -- a...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/xsrc/rev/80c069fc4191
branches:  trunk
changeset: 10037:80c069fc4191
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun Dec 30 06:59:35 2018 +0000

description:
fix merge botch -- at least compiles now.

diffstat:

 external/mit/xf86-video-r128/dist/src/r128_driver.c |  1 -
 external/mit/xf86-video-r128/dist/src/r128_exa.c    |  2 --
 2 files changed, 0 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r cca115268723 -r 80c069fc4191 external/mit/xf86-video-r128/dist/src/r128_driver.c
--- a/external/mit/xf86-video-r128/dist/src/r128_driver.c       Sun Dec 30 06:46:48 2018 +0000
+++ b/external/mit/xf86-video-r128/dist/src/r128_driver.c       Sun Dec 30 06:59:35 2018 +0000
@@ -1588,7 +1588,6 @@
 
     info->useEXA = FALSE;
 #ifdef USE_EXA
-#ifndef HAVE_XAA_H
     info->useEXA = TRUE;
 #endif
 
diff -r cca115268723 -r 80c069fc4191 external/mit/xf86-video-r128/dist/src/r128_exa.c
--- a/external/mit/xf86-video-r128/dist/src/r128_exa.c  Sun Dec 30 06:46:48 2018 +0000
+++ b/external/mit/xf86-video-r128/dist/src/r128_exa.c  Sun Dec 30 06:59:35 2018 +0000
@@ -440,12 +440,10 @@
     uint32_t   *s;
 
     if (!R128GetDatatypeBpp(bpp, &datatype)) {
-        R128TRACE(("R128GetDatatypeBpp failed\n"));
        return FALSE;
     }
 
     if (!R128GetPixmapOffsetPitch(pDst, &dst_pitch_offset)) {
-        R128TRACE(("R128GetPixmapOffsetPitch dest failed\n"));
        return FALSE;
     }