Module Name: src
Committed By: christos
Date: Fri Dec 9 02:23:25 UTC 2016
Modified Files:
src/sys/arch/amd64/conf: ALL GENERIC
Log Message:
kill PCPPISPEAKER
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.444 -r1.445 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.41 src/sys/arch/amd64/conf/ALL:1.42
--- src/sys/arch/amd64/conf/ALL:1.41 Thu Dec 8 06:31:09 2016
+++ src/sys/arch/amd64/conf/ALL Thu Dec 8 21:23:25 2016
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.41 2016/12/08 11:31:09 nat Exp $
+# $NetBSD: ALL,v 1.42 2016/12/09 02:23:25 christos 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.41 $"
+#ident "ALL-$Revision: 1.42 $"
maxusers 64 # estimated number of users
@@ -1375,7 +1375,6 @@ midi* at midibus?
midi* at pcppi? # MIDI interface to the PC speaker
# The spkr driver provides a simple tone interface to the built in speaker.
-options PCPPISPEAKER
spkr0 at pcppi? # PC speaker
#options VAUDIOSPEAKER
Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.444 src/sys/arch/amd64/conf/GENERIC:1.445
--- src/sys/arch/amd64/conf/GENERIC:1.444 Thu Dec 8 06:31:09 2016
+++ src/sys/arch/amd64/conf/GENERIC Thu Dec 8 21:23:25 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.444 2016/12/08 11:31:09 nat Exp $
+# $NetBSD: GENERIC,v 1.445 2016/12/09 02:23:25 christos 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.444 $"
+#ident "GENERIC-$Revision: 1.445 $"
maxusers 64 # estimated number of users
@@ -1109,7 +1109,6 @@ hdafg* at hdaudiobus?
audio* at audiobus?
# The spkr driver provides a simple tone interface to the built in speaker.
-options PCPPISPEAKER
spkr0 at pcppi? # PC speaker
#options VAUDIOSPEAKER
