Module Name: src
Committed By: riastradh
Date: Sat Mar 5 17:08:49 UTC 2016
Modified Files:
src/sys/arch/amd64/conf: GENERIC
src/sys/arch/i386/conf: GENERIC
Log Message:
Revert to disabling nouveau by default in x86 GENERIC.
Haven't had time to debug the issues that seem to affect pretty much
everyone. Maybe soon!
To generate a diff of this commit:
cvs rdiff -u -r1.424 -r1.425 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.1131 -r1.1132 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.424 src/sys/arch/amd64/conf/GENERIC:1.425
--- src/sys/arch/amd64/conf/GENERIC:1.424 Sat Feb 13 19:53:23 2016
+++ src/sys/arch/amd64/conf/GENERIC Sat Mar 5 17:08:49 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.424 2016/02/13 19:53:23 riastradh Exp $
+# $NetBSD: GENERIC,v 1.425 2016/03/05 17:08:49 riastradh 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.424 $"
+#ident "GENERIC-$Revision: 1.425 $"
maxusers 64 # estimated number of users
@@ -416,8 +416,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?
# Cryptographic Devices
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1131 src/sys/arch/i386/conf/GENERIC:1.1132
--- src/sys/arch/i386/conf/GENERIC:1.1131 Sat Feb 13 19:53:23 2016
+++ src/sys/arch/i386/conf/GENERIC Sat Mar 5 17:08:48 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1131 2016/02/13 19:53:23 riastradh Exp $
+# $NetBSD: GENERIC,v 1.1132 2016/03/05 17:08:48 riastradh 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.1131 $"
+#ident "GENERIC-$Revision: 1.1132 $"
maxusers 64 # estimated number of users
@@ -578,8 +578,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?
