Module Name: src
Committed By: maya
Date: Tue Dec 11 11:00:18 UTC 2018
Modified Files:
src/sys/arch/amd64/conf: GENERIC
src/sys/arch/i386/conf: GENERIC
Log Message:
disable nouveau. it hasn't been functional since the import of new drmkms
code.
To generate a diff of this commit:
cvs rdiff -u -r1.509 -r1.510 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.1194 -r1.1195 src/sys/arch/i386/conf/GENERIC
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.509 src/sys/arch/amd64/conf/GENERIC:1.510
--- src/sys/arch/amd64/conf/GENERIC:1.509 Sun Dec 2 21:00:13 2018
+++ src/sys/arch/amd64/conf/GENERIC Tue Dec 11 11:00:18 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.509 2018/12/02 21:00:13 maxv Exp $
+# $NetBSD: GENERIC,v 1.510 2018/12/11 11:00:18 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.509 $"
+#ident "GENERIC-$Revision: 1.510 $"
maxusers 64 # estimated number of users
@@ -434,8 +434,8 @@ intelfb* at intelfbbus?
radeon* at pci? dev ? function ?
radeondrmkmsfb* at radeonfbbus?
-nouveau* at pci? dev ? function ?
-nouveaufb* at nouveaufbbus?
+#nouveau* at pci? dev ? function ?
+#nouveaufb* at nouveaufbbus?
# DRMUMS drivers
#viadrmums* at drm?
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1194 src/sys/arch/i386/conf/GENERIC:1.1195
--- src/sys/arch/i386/conf/GENERIC:1.1194 Sat Nov 24 18:23:29 2018
+++ src/sys/arch/i386/conf/GENERIC Tue Dec 11 11:00:18 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1194 2018/11/24 18:23:29 bouyer Exp $
+# $NetBSD: GENERIC,v 1.1195 2018/12/11 11:00:18 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.1194 $"
+#ident "GENERIC-$Revision: 1.1195 $"
maxusers 64 # estimated number of users
@@ -559,8 +559,8 @@ intelfb* at intelfbbus?
radeon* at pci? dev ? function ?
radeondrmkmsfb* at radeonfbbus?
-nouveau* at pci? dev ? function ?
-nouveaufb* at nouveaufbbus?
+#nouveau* at pci? dev ? function ?
+#nouveaufb* at nouveaufbbus?
# DRMUMS drivers
#viadrmums* at drm?
