Module Name: src
Committed By: ahoka
Date: Fri Apr 9 14:02:05 UTC 2010
Modified Files:
src/sys/arch/amd64/conf: GENERIC
src/sys/arch/i386/conf: GENERIC MONOLITHIC
Log Message:
Remove pad from GENERIC, add to MONOLITH, we have it as a module now.
To generate a diff of this commit:
cvs rdiff -u -r1.274 -r1.275 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.977 -r1.978 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/i386/conf/MONOLITHIC
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/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.274 src/sys/arch/amd64/conf/GENERIC:1.275
--- src/sys/arch/amd64/conf/GENERIC:1.274 Thu Apr 8 17:32:30 2010
+++ src/sys/arch/amd64/conf/GENERIC Fri Apr 9 14:02:05 2010
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.274 2010/04/08 17:32:30 jruoho Exp $
+# $NetBSD: GENERIC,v 1.275 2010/04/09 14:02:05 ahoka Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.274 $"
+#ident "GENERIC-$Revision: 1.275 $"
maxusers 64 # estimated number of users
@@ -1149,9 +1149,6 @@
pseudo-device wsmux # mouse & keyboard multiplexor
pseudo-device wsfont
-# pseudo audio device driver
-pseudo-device pad
-
# userland interface to drivers, including autoconf and properties retrieval
pseudo-device drvctl
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.977 src/sys/arch/i386/conf/GENERIC:1.978
--- src/sys/arch/i386/conf/GENERIC:1.977 Thu Apr 8 17:32:30 2010
+++ src/sys/arch/i386/conf/GENERIC Fri Apr 9 14:02:05 2010
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.977 2010/04/08 17:32:30 jruoho Exp $
+# $NetBSD: GENERIC,v 1.978 2010/04/09 14:02:05 ahoka Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.977 $"
+#ident "GENERIC-$Revision: 1.978 $"
maxusers 64 # estimated number of users
@@ -1574,9 +1574,6 @@
# cmos(4) pseudo-device
pseudo-device cmos
-# pseudo audio device driver
-pseudo-device pad
-
# userland interface to drivers, including autoconf and properties retrieval
pseudo-device drvctl
Index: src/sys/arch/i386/conf/MONOLITHIC
diff -u src/sys/arch/i386/conf/MONOLITHIC:1.10 src/sys/arch/i386/conf/MONOLITHIC:1.11
--- src/sys/arch/i386/conf/MONOLITHIC:1.10 Fri Jan 1 22:12:19 2010
+++ src/sys/arch/i386/conf/MONOLITHIC Fri Apr 9 14:02:05 2010
@@ -1,4 +1,4 @@
-# $NetBSD: MONOLITHIC,v 1.10 2010/01/01 22:12:19 dholland Exp $
+# $NetBSD: MONOLITHIC,v 1.11 2010/04/09 14:02:05 ahoka Exp $
#
# Non MODULAR, used mostly as a reference as to what we modularized.
#
@@ -58,3 +58,6 @@
pseudo-device nsmb # experimental - SMB requester
pseudo-device putter # for puffs and pud
+
+pseudo-device pad # pseudo audio device driver
+
