[src/trunk]: src/sys/arch revert previous, nouveau apparently works for some ...

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

details:   https://anonhg.NetBSD.org/src/rev/27e8fe303fd5
branches:  trunk
changeset: 446580:27e8fe303fd5
user:      maya <maya%NetBSD.org@localhost>
date:      Tue Dec 11 16:52:49 2018 +0000

description:
revert previous, nouveau apparently works for some people.

diffstat:

 sys/arch/amd64/conf/GENERIC |  8 ++++----
 sys/arch/amd64/conf/INSTALL |  6 +++---
 sys/arch/i386/conf/GENERIC  |  8 ++++----
 sys/arch/i386/conf/INSTALL  |  6 +++---
 4 files changed, 14 insertions(+), 14 deletions(-)

diffs (109 lines):

diff -r 8d113f33bcc8 -r 27e8fe303fd5 sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC       Tue Dec 11 16:45:49 2018 +0000
+++ b/sys/arch/amd64/conf/GENERIC       Tue Dec 11 16:52:49 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.510 2018/12/11 11:00:18 maya Exp $
+# $NetBSD: GENERIC,v 1.511 2018/12/11 16:52:49 maya Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident         "GENERIC-$Revision: 1.510 $"
+#ident         "GENERIC-$Revision: 1.511 $"
 
 maxusers       64              # estimated number of users
 
@@ -434,8 +434,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?
diff -r 8d113f33bcc8 -r 27e8fe303fd5 sys/arch/amd64/conf/INSTALL
--- a/sys/arch/amd64/conf/INSTALL       Tue Dec 11 16:45:49 2018 +0000
+++ b/sys/arch/amd64/conf/INSTALL       Tue Dec 11 16:52:49 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.93 2018/12/11 14:04:15 maya Exp $
+# $NetBSD: INSTALL,v 1.94 2018/12/11 16:52:49 maya Exp $
 #
 #      INSTALL - Installation kernel.
 #
@@ -8,7 +8,7 @@
 include        "arch/amd64/conf/GENERIC"
 
 options        CONSDEVNAME="\"com\"",CONADDR=0x2f8,CONSPEED=115200
-#ident                 "INSTALL-$Revision: 1.93 $"
+#ident                 "INSTALL-$Revision: 1.94 $"
 
 no options     MEMORY_DISK_DYNAMIC
 options        MEMORY_DISK_IS_ROOT     # force root on memory disk
@@ -19,4 +19,4 @@
 # DRMKMS driver
 no i915drmkms*     at pci?
 no radeon*         at pci?
-#no nouveau*      at pci?
+no nouveau*       at pci?
diff -r 8d113f33bcc8 -r 27e8fe303fd5 sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC        Tue Dec 11 16:45:49 2018 +0000
+++ b/sys/arch/i386/conf/GENERIC        Tue Dec 11 16:52:49 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1195 2018/12/11 11:00:18 maya Exp $
+# $NetBSD: GENERIC,v 1.1196 2018/12/11 16:52:49 maya Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident         "GENERIC-$Revision: 1.1195 $"
+#ident         "GENERIC-$Revision: 1.1196 $"
 
 maxusers       64              # estimated number of users
 
@@ -559,8 +559,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?
diff -r 8d113f33bcc8 -r 27e8fe303fd5 sys/arch/i386/conf/INSTALL
--- a/sys/arch/i386/conf/INSTALL        Tue Dec 11 16:45:49 2018 +0000
+++ b/sys/arch/i386/conf/INSTALL        Tue Dec 11 16:52:49 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.334 2018/12/11 14:04:15 maya Exp $
+# $NetBSD: INSTALL,v 1.335 2018/12/11 16:52:49 maya Exp $
 #
 #      INSTALL - Installation kernel.
 #
@@ -7,7 +7,7 @@
 
 include        "arch/i386/conf/MONOLITHIC"
 
-#ident                 "INSTALL-$Revision: 1.334 $"
+#ident                 "INSTALL-$Revision: 1.335 $"
 
 no options     MEMORY_DISK_DYNAMIC
 options        MEMORY_DISK_IS_ROOT     # force root on memory disk
@@ -18,7 +18,7 @@
 # DRMKMS driver
 no i915drmkms*     at pci?
 no radeon*         at pci?
-#no nouveau*      at pci?
+no nouveau*       at pci?
 
 # pre-PCI graphics drivers, not enabled in GENERIC
 vga0           at isa?