Module Name: src
Committed By: riastradh
Date: Fri Mar 6 02:55:11 UTC 2015
Modified Files:
src/sys/arch/amd64/conf: ALL GENERIC
Log Message:
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.)
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.408 -r1.409 src/sys/arch/amd64/conf/GENERIC
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/conf/ALL
diff -u src/sys/arch/amd64/conf/ALL:1.25 src/sys/arch/amd64/conf/ALL:1.26
--- src/sys/arch/amd64/conf/ALL:1.25 Fri Feb 13 18:57:47 2015
+++ src/sys/arch/amd64/conf/ALL Fri Mar 6 02:55:11 2015
@@ -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 @@ include "arch/amd64/conf/std.amd64"
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 @@ intelfb* at intelfbbus?
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 NOTDEF_DEBUG
options NOT_DEBUG
options NSIODEBUG
options NTFS_DEBUG
-options NV_DEBUG
options OBOE_DEBUG
options OFW_DEBUG
options OHCI_DEBUG
Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.408 src/sys/arch/amd64/conf/GENERIC:1.409
--- src/sys/arch/amd64/conf/GENERIC:1.408 Fri Feb 13 18:57:47 2015
+++ src/sys/arch/amd64/conf/GENERIC Fri Mar 6 02:55:11 2015
@@ -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 @@ include "arch/amd64/conf/std.amd64"
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 @@ intelfb* at intelfbbus?
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
