[src/trunk]: src/sys/arch/amd64/conf kill PCPPISPEAKER

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

details:   https://anonhg.NetBSD.org/src/rev/f6f3345b0e13
branches:  trunk
changeset: 349367:f6f3345b0e13
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Dec 09 02:23:25 2016 +0000

description:
kill PCPPISPEAKER

diffstat:

 sys/arch/amd64/conf/ALL     |  5 ++---
 sys/arch/amd64/conf/GENERIC |  5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diffs (52 lines):

diff -r 24e1268c4f20 -r f6f3345b0e13 sys/arch/amd64/conf/ALL
--- a/sys/arch/amd64/conf/ALL   Fri Dec 09 02:22:56 2016 +0000
+++ b/sys/arch/amd64/conf/ALL   Fri Dec 09 02:23:25 2016 +0000
@@ -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 @@
 
 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 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
diff -r 24e1268c4f20 -r f6f3345b0e13 sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC       Fri Dec 09 02:22:56 2016 +0000
+++ b/sys/arch/amd64/conf/GENERIC       Fri Dec 09 02:23:25 2016 +0000
@@ -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 @@
 
 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 @@
 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