[src/trunk]: src/sys/arch/amd64/conf Fix commented nouveau in amd64/GENERIC. ...

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

details:   https://anonhg.NetBSD.org/src/rev/8acf749610db
branches:  trunk
changeset: 336560:8acf749610db
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Fri Mar 06 02:55:11 2015 +0000

description:
Fix commented nouveau in amd64/GENERIC.  Add nouveau to amd64/ALL.

Remove NV_DEBUG from amd64/ALL -- it breaks nouveau, and I can't find
any use of it in src/sys outside arch/atari/dev/nvram.c, which surely
has no relevance to amd64.

(Nouveau has an internal NV_DEBUG(...) macro for debug messages.)

diffstat:

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

diffs (66 lines):

diff -r 3c020ce2af46 -r 8acf749610db sys/arch/amd64/conf/ALL
--- a/sys/arch/amd64/conf/ALL   Fri Mar 06 01:43:07 2015 +0000
+++ b/sys/arch/amd64/conf/ALL   Fri Mar 06 02:55:11 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.25 2015/02/13 18:57:47 nonaka Exp $
+# $NetBSD: ALL,v 1.26 2015/03/06 02:55:11 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.25 $"
+#ident                 "ALL-$Revision: 1.26 $"
 
 maxusers       64              # estimated number of users
 
@@ -532,8 +532,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?
 
 attimer0       at isa?
 pcppi0         at isa?
@@ -2050,7 +2050,6 @@
 options NOT_DEBUG
 options NSIODEBUG
 options NTFS_DEBUG
-options NV_DEBUG
 options OBOE_DEBUG
 options OFW_DEBUG
 options OHCI_DEBUG
diff -r 3c020ce2af46 -r 8acf749610db sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC       Fri Mar 06 01:43:07 2015 +0000
+++ b/sys/arch/amd64/conf/GENERIC       Fri Mar 06 02:55:11 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.408 2015/02/13 18:57:47 nonaka Exp $
+# $NetBSD: GENERIC,v 1.409 2015/03/06 02:55:11 riastradh Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.408 $"
+#ident                 "GENERIC-$Revision: 1.409 $"
 
 maxusers       64              # estimated number of users
 
@@ -415,8 +415,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