Module Name: xsrc
Committed By: mrg
Date: Mon Jul 20 01:19:27 UTC 2015
Modified Files:
xsrc/external/mit/xf86-video-mach64/dist/src: atipreinit.c
Log Message:
fix a merge botch in the previous.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xf86-video-mach64/dist/src/atipreinit.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-mach64/dist/src/atipreinit.c
diff -u xsrc/external/mit/xf86-video-mach64/dist/src/atipreinit.c:1.5 xsrc/external/mit/xf86-video-mach64/dist/src/atipreinit.c:1.6
--- xsrc/external/mit/xf86-video-mach64/dist/src/atipreinit.c:1.5 Mon Jul 20 00:10:28 2015
+++ xsrc/external/mit/xf86-video-mach64/dist/src/atipreinit.c Mon Jul 20 01:19:27 2015
@@ -729,8 +729,6 @@ ATIPreInit
xf86SetDDCproperties(pScreenInfo, ConfiguredMonitor);
}
-#endif /* AVOID_CPIO */
-
if (flags & PROBE_DETECT)
{
return TRUE;
