[src/trunk]: src/sys/arch Revert to disabling nouveau by default in x86 GENERIC.

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

details:   https://anonhg.NetBSD.org/src/rev/eaf17611fd59
branches:  trunk
changeset: 343931:eaf17611fd59
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sat Mar 05 17:08:48 2016 +0000

description:
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!

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 7d8a52dfdaea -r eaf17611fd59 sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC       Sat Mar 05 08:15:01 2016 +0000
+++ b/sys/arch/amd64/conf/GENERIC       Sat Mar 05 17:08:48 2016 +0000
@@ -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 @@
 
 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 @@
 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 7d8a52dfdaea -r eaf17611fd59 sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC        Sat Mar 05 08:15:01 2016 +0000
+++ b/sys/arch/i386/conf/GENERIC        Sat Mar 05 17:08:48 2016 +0000
@@ -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 @@
 
 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 @@
 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?