Module Name: xsrc
Committed By: mrg
Date: Mon Dec 31 10:35:46 UTC 2018
Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: xf86AutoConfig.c
Log Message:
use xf86AddMatchedDriver().
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.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/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c:1.11 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c:1.12
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c:1.11 Mon Dec 31 09:50:00 2018
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c Mon Dec 31 10:35:46 2018
@@ -239,11 +239,11 @@ listPossibleVideoDrivers(XF86MatchedDriv
/* XXXMRG: xorg-server 1.10/1.18 -- merge into xf86PlatformMatchDriver()? */
#ifdef __NetBSD__
#if defined(__shark)
- matches[i++] = xnfstrdup("chips");
- matches[i++] = xnfstrdup("igs");
+ xf86AddMatchedDriver(md, "chips");
+ xf86AddMatchedDriver(md, "igs");
#elif defined(__sgimips)
- matches[i++] = xnfstrdup("crime");
- matches[i++] = xnfstrdup("newport");
+ xf86AddMatchedDriver(md, "crime");
+ xf86AddMatchedDriver(md, "newport");
#elif defined(__sparc) || defined(__sparc64)
/* dig through /dev/fb* */
{
@@ -269,7 +269,7 @@ listPossibleVideoDrivers(XF86MatchedDriv
if (sbusDeviceTable[dev].fbType == fbt.fb_type) {
xf86Msg(X_ERROR,"%s: found %s\n", __func__,
sbusDeviceTable[dev].driverName);
- matches[i++] = xnfstrdup(sbusDeviceTable[dev].driverName);
+ xf86AddMatchedDriver(md, sbusDeviceTable[dev].driverName);
}
}
}
