Module Name: src
Committed By: riastradh
Date: Wed Apr 13 15:26:28 UTC 2016
Modified Files:
src/sys/arch/amd64/conf: GENERIC
src/sys/arch/i386/conf: GENERIC
Log Message:
Enable nouveau by default again in x86 GENERIC.
To generate a diff of this commit:
cvs rdiff -u -r1.429 -r1.430 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.1133 -r1.1134 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.429 src/sys/arch/amd64/conf/GENERIC:1.430
--- src/sys/arch/amd64/conf/GENERIC:1.429 Sun Apr 10 15:39:27 2016
+++ src/sys/arch/amd64/conf/GENERIC Wed Apr 13 15:26:28 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.429 2016/04/10 15:39:27 christos Exp $
+# $NetBSD: GENERIC,v 1.430 2016/04/13 15:26:28 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.429 $"
+#ident "GENERIC-$Revision: 1.430 $"
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.1133 src/sys/arch/i386/conf/GENERIC:1.1134
--- src/sys/arch/i386/conf/GENERIC:1.1133 Sat Mar 19 23:21:02 2016
+++ src/sys/arch/i386/conf/GENERIC Wed Apr 13 15:26:27 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1133 2016/03/19 23:21:02 gdt Exp $
+# $NetBSD: GENERIC,v 1.1134 2016/04/13 15:26:27 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.1133 $"
+#ident "GENERIC-$Revision: 1.1134 $"
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?
