Module Name: src
Committed By: maya
Date: Tue Jul 10 17:01:44 UTC 2018
Modified Files:
src/distrib/sets/lists/man: mi
src/distrib/sets/lists/modules: md.i386
src/doc: CHANGES
src/share/man/man4: Makefile drm.4
src/sys/arch/amd64/conf: ALL GENERIC
src/sys/arch/i386/conf: ALL GENERIC
src/sys/external/bsd/drm/conf: files.drm
src/sys/external/bsd/drm/dist/bsd-core: drm_pciids.h
src/sys/external/bsd/drm/dist/scripts: create_lk_drm.sh
create_lk_gpu.sh
src/sys/external/bsd/drm/dist/shared-core: drm_pciids.txt
src/sys/modules: Makefile
Removed Files:
src/sys/external/bsd/drm/dist/bsd-core: via_dmablit.c via_dmablit.h
via_drv.c
src/sys/external/bsd/drm/dist/bsd-core/via: Makefile
src/sys/external/bsd/drm/dist/shared-core: via_3d_reg.h via_dma.c
via_drm.h via_drv.h via_ds.c via_ds.h via_irq.c via_map.c via_mm.c
via_mm.h via_verifier.c via_verifier.h via_video.c
src/sys/modules/viadrm: Makefile viadrm.ioconf
Log Message:
Remove viadrm(4), superseded by viadrmums.
Aside from viadrm using older drm code, it's also dysfunctional right now.
See PR port-i386/53364.
To generate a diff of this commit:
cvs rdiff -u -r1.1595 -r1.1596 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.78 -r1.79 src/distrib/sets/lists/modules/md.i386
cvs rdiff -u -r1.2406 -r1.2407 src/doc/CHANGES
cvs rdiff -u -r1.656 -r1.657 src/share/man/man4/Makefile
cvs rdiff -u -r1.15 -r1.16 src/share/man/man4/drm.4
cvs rdiff -u -r1.90 -r1.91 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.493 -r1.494 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.440 -r1.441 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.1180 -r1.1181 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.7 -r1.8 src/sys/external/bsd/drm/conf/files.drm
cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/drm/dist/bsd-core/drm_pciids.h
cvs rdiff -u -r1.2 -r0 src/sys/external/bsd/drm/dist/bsd-core/via_dmablit.c
cvs rdiff -u -r1.1 -r0 src/sys/external/bsd/drm/dist/bsd-core/via_dmablit.h
cvs rdiff -u -r1.8 -r0 src/sys/external/bsd/drm/dist/bsd-core/via_drv.c
cvs rdiff -u -r1.3 -r0 src/sys/external/bsd/drm/dist/bsd-core/via/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/sys/external/bsd/drm/dist/scripts/create_lk_drm.sh \
src/sys/external/bsd/drm/dist/scripts/create_lk_gpu.sh
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm/dist/shared-core/drm_pciids.txt
cvs rdiff -u -r1.1.1.1 -r0 \
src/sys/external/bsd/drm/dist/shared-core/via_3d_reg.h \
src/sys/external/bsd/drm/dist/shared-core/via_ds.h \
src/sys/external/bsd/drm/dist/shared-core/via_mm.h
cvs rdiff -u -r1.4 -r0 src/sys/external/bsd/drm/dist/shared-core/via_dma.c \
src/sys/external/bsd/drm/dist/shared-core/via_drv.h \
src/sys/external/bsd/drm/dist/shared-core/via_irq.c
cvs rdiff -u -r1.2 -r0 src/sys/external/bsd/drm/dist/shared-core/via_drm.h \
src/sys/external/bsd/drm/dist/shared-core/via_ds.c \
src/sys/external/bsd/drm/dist/shared-core/via_verifier.h \
src/sys/external/bsd/drm/dist/shared-core/via_video.c
cvs rdiff -u -r1.3 -r0 src/sys/external/bsd/drm/dist/shared-core/via_map.c \
src/sys/external/bsd/drm/dist/shared-core/via_mm.c \
src/sys/external/bsd/drm/dist/shared-core/via_verifier.c
cvs rdiff -u -r1.205 -r1.206 src/sys/modules/Makefile
cvs rdiff -u -r1.3 -r0 src/sys/modules/viadrm/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/modules/viadrm/viadrm.ioconf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1595 src/distrib/sets/lists/man/mi:1.1596
--- src/distrib/sets/lists/man/mi:1.1595 Fri Jun 29 12:34:14 2018
+++ src/distrib/sets/lists/man/mi Tue Jul 10 17:01:42 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1595 2018/06/29 12:34:14 roy Exp $
+# $NetBSD: mi,v 1.1596 2018/07/10 17:01:42 maya Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -1959,7 +1959,7 @@
./usr/share/man/cat4/verifiedexec.0 man-obsolete obsolete
./usr/share/man/cat4/vga.0 man-sys-catman .cat
./usr/share/man/cat4/vge.0 man-sys-catman .cat
-./usr/share/man/cat4/viadrm.0 man-sys-catman .cat
+./usr/share/man/cat4/viadrm.0 man-obsolete obsolete
./usr/share/man/cat4/viaenv.0 man-sys-catman .cat
./usr/share/man/cat4/viaide.0 man-sys-catman .cat
./usr/share/man/cat4/viapm.0 man-obsolete obsolete
@@ -5026,7 +5026,7 @@
./usr/share/man/html4/veriexec.html man-sys-htmlman html
./usr/share/man/html4/vga.html man-sys-htmlman html
./usr/share/man/html4/vge.html man-sys-htmlman html
-./usr/share/man/html4/viadrm.html man-sys-htmlman html
+./usr/share/man/html4/viadrm.html man-obsolete obsolete
./usr/share/man/html4/viaenv.html man-sys-htmlman html
./usr/share/man/html4/viaide.html man-sys-htmlman html
./usr/share/man/html4/video.html man-sys-htmlman html
@@ -8021,7 +8021,7 @@
./usr/share/man/man4/verifiedexec.4 man-obsolete obsolete
./usr/share/man/man4/vga.4 man-sys-man .man
./usr/share/man/man4/vge.4 man-sys-man .man
-./usr/share/man/man4/viadrm.4 man-sys-man .man
+./usr/share/man/man4/viadrm.4 man-obsolete obsolete
./usr/share/man/man4/viaenv.4 man-sys-man .man
./usr/share/man/man4/viaide.4 man-sys-man .man
./usr/share/man/man4/viapm.4 man-obsolete obsolete
Index: src/distrib/sets/lists/modules/md.i386
diff -u src/distrib/sets/lists/modules/md.i386:1.78 src/distrib/sets/lists/modules/md.i386:1.79
--- src/distrib/sets/lists/modules/md.i386:1.78 Mon Feb 26 07:30:17 2018
+++ src/distrib/sets/lists/modules/md.i386 Tue Jul 10 17:01:42 2018
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.78 2018/02/26 07:30:17 pgoyette Exp $
+# $NetBSD: md.i386,v 1.79 2018/07/10 17:01:42 maya Exp $
#
# NOTE that there are three sets of files here:
# @MODULEDIR@, i386-xen, and i386pae-xen
@@ -182,8 +182,8 @@
./@MODULEDIR@/ubsec/ubsec.kmod base-kernel-modules kmod
./@MODULEDIR@/viac7temp base-kernel-modules kmod
./@MODULEDIR@/viac7temp/viac7temp.kmod base-kernel-modules kmod
-./@MODULEDIR@/viadrm base-kernel-modules kmod
-./@MODULEDIR@/viadrm/viadrm.kmod base-kernel-modules kmod
+./@MODULEDIR@/viadrm base-obsolete obsolete
+./@MODULEDIR@/viadrm/viadrm.kmod base-obsolete obsolete
./@MODULEDIR@/viadrmums base-kernel-modules kmod
./@MODULEDIR@/viadrmums/viadrmums.kmod base-kernel-modules kmod
./@MODULEDIR@/vmt base-kernel-modules kmod
Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.2406 src/doc/CHANGES:1.2407
--- src/doc/CHANGES:1.2406 Mon Jul 9 10:08:35 2018
+++ src/doc/CHANGES Tue Jul 10 17:01:43 2018
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2406 $>
+# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2407 $>
#
#
# [Note: This file does not mention every change made to the NetBSD source tree.
@@ -169,3 +169,4 @@ Changes from NetBSD 8.0 to NetBSD 9.0:
[msaitoh 20180626]
gcc: add lsan the Leak Sanitizer [christos 20180626]
aarch64: Add support for SMP. [ryo 20180709]
+ viadrm(4): Removed, superseded by viadrmums. [maya 20180710]
Index: src/share/man/man4/Makefile
diff -u src/share/man/man4/Makefile:1.656 src/share/man/man4/Makefile:1.657
--- src/share/man/man4/Makefile:1.656 Wed Jun 13 03:28:36 2018
+++ src/share/man/man4/Makefile Tue Jul 10 17:01:43 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.656 2018/06/13 03:28:36 ozaki-r Exp $
+# $NetBSD: Makefile,v 1.657 2018/07/10 17:01:43 maya Exp $
# @(#)Makefile 8.1 (Berkeley) 6/18/93
MAN= aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \
@@ -177,7 +177,6 @@ MLINKS+=drm.4 radeondrm.4
MLINKS+=drm.4 savagedrm.4
MLINKS+=drm.4 sisdrm.4
MLINKS+=drm.4 tdfxdrm.4
-MLINKS+=drm.4 viadrm.4
MLINKS+=acpiec.4 acpiecdt.4
MLINKS+=acpivga.4 acpiout.4
Index: src/share/man/man4/drm.4
diff -u src/share/man/man4/drm.4:1.15 src/share/man/man4/drm.4:1.16
--- src/share/man/man4/drm.4:1.15 Tue Jun 4 07:47:54 2013
+++ src/share/man/man4/drm.4 Tue Jul 10 17:01:43 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: drm.4,v 1.15 2013/06/04 07:47:54 wiz Exp $
+.\" $NetBSD: drm.4,v 1.16 2018/07/10 17:01:43 maya Exp $
.\"
.\" Copyright (c) 2007, 2013 Thomas Klausner
.\" All rights reserved.
@@ -23,7 +23,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd June 4, 2013
+.Dd July 10, 2018
.Dt DRM 4
.Os
.Sh NAME
@@ -38,7 +38,6 @@
.Cd savagedrm* at drm?
.Cd sisdrm* at drm?
.Cd tdfxdrm* at drm?
-.Cd viadrm* at drm?
.Pp
.Cd options DRM_DEBUG
.Cd options DRM_NO_AGP
Index: src/sys/arch/amd64/conf/ALL
diff -u src/sys/arch/amd64/conf/ALL:1.90 src/sys/arch/amd64/conf/ALL:1.91
--- src/sys/arch/amd64/conf/ALL:1.90 Sat Jun 16 15:04:29 2018
+++ src/sys/arch/amd64/conf/ALL Tue Jul 10 17:01:43 2018
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.90 2018/06/16 15:04:29 jdolecek Exp $
+# $NetBSD: ALL,v 1.91 2018/07/10 17:01:43 maya Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.90 $"
+#ident "ALL-$Revision: 1.91 $"
maxusers 64 # estimated number of users
@@ -511,7 +511,6 @@ wcfb* at pci? dev ? function ?
#sisdrm* at drm? # SiS DRM driver
#tdfxdrm* at drm? # 3dfx (voodoo) DRM driver
#vboxdrm* at drm? # VirtualBox DRM driver
-#viadrm* at drm? # VIA UniChrome DRM driver
# DRMKMS drivers
i915drmkms* at pci? dev ? function ?
Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.493 src/sys/arch/amd64/conf/GENERIC:1.494
--- src/sys/arch/amd64/conf/GENERIC:1.493 Thu Jun 7 13:36:28 2018
+++ src/sys/arch/amd64/conf/GENERIC Tue Jul 10 17:01:43 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.493 2018/06/07 13:36:28 thorpej Exp $
+# $NetBSD: GENERIC,v 1.494 2018/07/10 17:01:43 maya Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.493 $"
+#ident "GENERIC-$Revision: 1.494 $"
maxusers 64 # estimated number of users
@@ -418,7 +418,6 @@ sysbeep0 at pcppi?
#savagedrm* at drm? # S3 Savage DRM driver
#sisdrm* at drm? # SiS DRM driver
#tdfxdrm* at drm? # 3dfx (voodoo) DRM driver
-#viadrm* at drm? # VIA DRM driver
# DRMKMS drivers
i915drmkms* at pci? dev ? function ?
Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.440 src/sys/arch/i386/conf/ALL:1.441
--- src/sys/arch/i386/conf/ALL:1.440 Thu Jun 7 13:36:29 2018
+++ src/sys/arch/i386/conf/ALL Tue Jul 10 17:01:43 2018
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.440 2018/06/07 13:36:29 thorpej Exp $
+# $NetBSD: ALL,v 1.441 2018/07/10 17:01:43 maya Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.440 $"
+#ident "ALL-$Revision: 1.441 $"
maxusers 64 # estimated number of users
@@ -595,7 +595,6 @@ wsdisplay* at wsemuldisplaydev?
#sisdrm* at drm? # SiS DRM driver
#tdfxdrm* at drm? # 3dfx (voodoo) DRM driver
#vboxdrm* at drm? # VirtualBox DRM driver
-#viadrm* at drm? # VIA UniChrome DRM driver
# DRMKMS drivers
i915drmkms* at pci? dev ? function ?
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1180 src/sys/arch/i386/conf/GENERIC:1.1181
--- src/sys/arch/i386/conf/GENERIC:1.1180 Thu Jun 7 13:36:29 2018
+++ src/sys/arch/i386/conf/GENERIC Tue Jul 10 17:01:43 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1180 2018/06/07 13:36:29 thorpej Exp $
+# $NetBSD: GENERIC,v 1.1181 2018/07/10 17:01:43 maya Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.1180 $"
+#ident "GENERIC-$Revision: 1.1181 $"
maxusers 64 # estimated number of users
@@ -558,7 +558,6 @@ sysbeep0 at pcppi?
#savagedrm* at drm? # S3 Savage DRM driver
#sisdrm* at drm? # SiS DRM driver
#tdfxdrm* at drm? # 3dfx (voodoo) DRM driver
-#viadrm* at drm? # VIA DRM driver
# DRMKMS drivers
i915drmkms* at pci? dev ? function ?
Index: src/sys/external/bsd/drm/conf/files.drm
diff -u src/sys/external/bsd/drm/conf/files.drm:1.7 src/sys/external/bsd/drm/conf/files.drm:1.8
--- src/sys/external/bsd/drm/conf/files.drm:1.7 Sun Mar 27 08:45:11 2011
+++ src/sys/external/bsd/drm/conf/files.drm Tue Jul 10 17:01:43 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.drm,v 1.7 2011/03/27 08:45:11 mlelstv Exp $
+# $NetBSD: files.drm,v 1.8 2018/07/10 17:01:43 maya Exp $
# direct rendering modules
define drmbase
@@ -117,15 +117,3 @@ file external/bsd/drm/dist/shared-core/s
device tdfxdrm: drmbase, drmpci
attach tdfxdrm at drm
file external/bsd/drm/dist/bsd-core/tdfx_drv.c tdfxdrm
-
-device viadrm: drmbase, drmpci
-attach viadrm at drm
-file external/bsd/drm/dist/bsd-core/via_drv.c viadrm
-file external/bsd/drm/dist/bsd-core/via_dmablit.c viadrm
-file external/bsd/drm/dist/shared-core/via_dma.c viadrm
-file external/bsd/drm/dist/shared-core/via_ds.c viadrm
-file external/bsd/drm/dist/shared-core/via_irq.c viadrm
-file external/bsd/drm/dist/shared-core/via_map.c viadrm
-file external/bsd/drm/dist/shared-core/via_mm.c viadrm
-file external/bsd/drm/dist/shared-core/via_verifier.c viadrm
-file external/bsd/drm/dist/shared-core/via_video.c viadrm
Index: src/sys/external/bsd/drm/dist/bsd-core/drm_pciids.h
diff -u src/sys/external/bsd/drm/dist/bsd-core/drm_pciids.h:1.8 src/sys/external/bsd/drm/dist/bsd-core/drm_pciids.h:1.9
--- src/sys/external/bsd/drm/dist/bsd-core/drm_pciids.h:1.8 Mon Jun 11 16:51:04 2012
+++ src/sys/external/bsd/drm/dist/bsd-core/drm_pciids.h Tue Jul 10 17:01:43 2018
@@ -500,19 +500,6 @@
{0x121a, 0x000b, 0, "3dfx Voodoo4 4200"}, \
{0, 0, 0, NULL}
-#define viadrv_PCI_IDS \
- {0x1106, 0x3022, 0, "VIA CLE266 3022"}, \
- {0x1106, 0x3118, VIA_PRO_GROUP_A, "VIA CN400 / PM8X0"}, \
- {0x1106, 0x3122, 0, "VIA CLE266"}, \
- {0x1106, 0x7205, 0, "VIA KM400"}, \
- {0x1106, 0x3108, 0, "VIA K8M800"}, \
- {0x1106, 0x3344, 0, "VIA CN700 / VM800 / P4M800Pro"}, \
- {0x1106, 0x3343, 0, "VIA P4M890"}, \
- {0x1106, 0x3230, VIA_DX9_0, "VIA K8M890"}, \
- {0x1106, 0x3157, VIA_PRO_GROUP_A, "VIA CX700"}, \
- {0x1106, 0x3371, VIA_DX9_0, "VIA P4M900 / VN896"}, \
- {0, 0, 0, NULL}
-
#define i810_PCI_IDS \
{0x8086, 0x7121, 0, "Intel i810 GMCH"}, \
{0x8086, 0x7123, 0, "Intel i810-DC100 GMCH"}, \
Index: src/sys/external/bsd/drm/dist/scripts/create_lk_drm.sh
diff -u src/sys/external/bsd/drm/dist/scripts/create_lk_drm.sh:1.1.1.1 src/sys/external/bsd/drm/dist/scripts/create_lk_drm.sh:1.2
--- src/sys/external/bsd/drm/dist/scripts/create_lk_drm.sh:1.1.1.1 Sat Jul 19 05:30:38 2008
+++ src/sys/external/bsd/drm/dist/scripts/create_lk_drm.sh Tue Jul 10 17:01:43 2018
@@ -31,7 +31,6 @@ cp linux-core/Kconfig $OUTDIR/.tmp
cd $OUTDIR
rm -rf .tmp
-rm via_ds.[ch]
rm sis_ds.[ch]
cd -
Index: src/sys/external/bsd/drm/dist/scripts/create_lk_gpu.sh
diff -u src/sys/external/bsd/drm/dist/scripts/create_lk_gpu.sh:1.1.1.1 src/sys/external/bsd/drm/dist/scripts/create_lk_gpu.sh:1.2
--- src/sys/external/bsd/drm/dist/scripts/create_lk_gpu.sh:1.1.1.1 Fri Jun 19 03:22:24 2009
+++ src/sys/external/bsd/drm/dist/scripts/create_lk_gpu.sh Tue Jul 10 17:01:43 2018
@@ -35,12 +35,11 @@ mv $DRMDIR/*_drm.h $HDRDIR
cd $DRMDIR
rm -rf .tmp
-rm via_ds.[ch]
rm sis_ds.[ch]
rm amd*.[ch]
rm radeon_ms*.[ch]
-for i in radeon mach64 r128 mga i915 i810 via savage sis xgi nouveau tdfx ffb imagine
+for i in radeon mach64 r128 mga i915 i810 savage sis xgi nouveau tdfx ffb imagine
do
mkdir ./$i
mv $i*.[ch] $i/
Index: src/sys/external/bsd/drm/dist/shared-core/drm_pciids.txt
diff -u src/sys/external/bsd/drm/dist/shared-core/drm_pciids.txt:1.3 src/sys/external/bsd/drm/dist/shared-core/drm_pciids.txt:1.4
--- src/sys/external/bsd/drm/dist/shared-core/drm_pciids.txt:1.3 Mon Jun 11 16:51:04 2012
+++ src/sys/external/bsd/drm/dist/shared-core/drm_pciids.txt Tue Jul 10 17:01:43 2018
@@ -439,18 +439,6 @@
0x121a 0x0009 0 "3dfx Voodoo5 5500"
0x121a 0x000b 0 "3dfx Voodoo4 4200"
-[viadrv]
-0x1106 0x3022 0 "VIA CLE266 3022"
-0x1106 0x3118 VIA_PRO_GROUP_A "VIA CN400 / PM8X0"
-0x1106 0x3122 0 "VIA CLE266"
-0x1106 0x7205 0 "VIA KM400"
-0x1106 0x3108 0 "VIA K8M800"
-0x1106 0x3344 0 "VIA CN700 / VM800 / P4M800Pro"
-0x1106 0x3343 0 "VIA P4M890"
-0x1106 0x3230 VIA_DX9_0 "VIA K8M890"
-0x1106 0x3157 VIA_PRO_GROUP_A "VIA CX700"
-0x1106 0x3371 VIA_DX9_0 "VIA P4M900 / VN896"
-
[i810]
0x8086 0x7121 0 "Intel i810 GMCH"
0x8086 0x7123 0 "Intel i810-DC100 GMCH"
Index: src/sys/modules/Makefile
diff -u src/sys/modules/Makefile:1.205 src/sys/modules/Makefile:1.206
--- src/sys/modules/Makefile:1.205 Wed Jun 6 16:46:02 2018
+++ src/sys/modules/Makefile Tue Jul 10 17:01:43 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.205 2018/06/06 16:46:02 jakllsch Exp $
+# $NetBSD: Makefile,v 1.206 2018/07/10 17:01:43 maya Exp $
.include <bsd.own.mk>
@@ -284,7 +284,6 @@ SUBDIR+= savagedrm
SUBDIR+= sisdrm
SUBDIR+= tdfxdrm
SUBDIR+= viac7temp
-SUBDIR+= viadrm
SUBDIR+= viadrmums
.endif
