[src/trunk]: src/sys/arch/i386/conf Enable nouveau in i386/ALL. Omit incorre...

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

details:   https://anonhg.NetBSD.org/src/rev/a6a261108f02
branches:  trunk
changeset: 345161:a6a261108f02
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Wed May 11 02:09:10 2016 +0000

description:
Enable nouveau in i386/ALL.  Omit incorrect option NV_DEBUG.

NV_DEBUG does not appear except as a macro function in nouveau, which
is broken by defining it on the command line.

>From coypu.

diffstat:

 sys/arch/i386/conf/ALL |  9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diffs (37 lines):

diff -r 2f4e450a4739 -r a6a261108f02 sys/arch/i386/conf/ALL
--- a/sys/arch/i386/conf/ALL    Tue May 10 23:45:45 2016 +0000
+++ b/sys/arch/i386/conf/ALL    Wed May 11 02:09:10 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.397 2015/10/25 22:48:23 khorben Exp $
+# $NetBSD: ALL,v 1.398 2016/05/11 02:09:10 riastradh Exp $
 # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
 #
 # ALL machine description file
@@ -17,7 +17,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "ALL-$Revision: 1.397 $"
+#ident                 "ALL-$Revision: 1.398 $"
 
 maxusers       64              # estimated number of users
 
@@ -610,8 +610,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?
@@ -2253,7 +2253,6 @@
 options NOT_DEBUG
 options NSIODEBUG
 options NTFS_DEBUG
-options NV_DEBUG
 options OBOE_DEBUG
 options OFW_DEBUG
 options OHCI_DEBUG