[src/trunk]: src/sys/arch Enable nouveau by default again in x86 GENERIC.

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a309a6d9324b
branches:  trunk
changeset: 344735:a309a6d9324b
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Wed Apr 13 15:26:27 2016 +0000

description:
Enable nouveau by default again in x86 GENERIC.

diffstat:

 sys/arch/amd64/conf/GENERIC |  8 ++++----
 sys/arch/i386/conf/GENERIC  |  8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diffs (58 lines):

diff -r efb195acf8f2 -r a309a6d9324b sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC       Wed Apr 13 11:48:29 2016 +0000
+++ b/sys/arch/amd64/conf/GENERIC       Wed Apr 13 15:26:27 2016 +0000
@@ -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 @@
 
 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 @@
 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
 
diff -r efb195acf8f2 -r a309a6d9324b sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC        Wed Apr 13 11:48:29 2016 +0000
+++ b/sys/arch/i386/conf/GENERIC        Wed Apr 13 15:26:27 2016 +0000
@@ -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 @@
 
 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 @@
 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?