[src/trunk]: src/sys/arch/i386/conf PCPPISPEAKER

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

details:   https://anonhg.NetBSD.org/src/rev/2df2d44272c2
branches:  trunk
changeset: 349368:2df2d44272c2
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Dec 09 02:24:17 2016 +0000

description:
PCPPISPEAKER

diffstat:

 sys/arch/i386/conf/ALL            |  5 ++---
 sys/arch/i386/conf/GENERIC        |  5 ++---
 sys/arch/i386/conf/GENERIC_TINY   |  3 +--
 sys/arch/i386/conf/INSTALL_FLOPPY |  3 +--
 sys/arch/i386/conf/INSTALL_TINY   |  3 +--
 5 files changed, 7 insertions(+), 12 deletions(-)

diffs (103 lines):

diff -r f6f3345b0e13 -r 2df2d44272c2 sys/arch/i386/conf/ALL
--- a/sys/arch/i386/conf/ALL    Fri Dec 09 02:23:25 2016 +0000
+++ b/sys/arch/i386/conf/ALL    Fri Dec 09 02:24:17 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.404 2016/12/08 11:31:10 nat Exp $
+# $NetBSD: ALL,v 1.405 2016/12/09 02:24:17 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.404 $"
+#ident                 "ALL-$Revision: 1.405 $"
 
 maxusers       64              # estimated number of users
 
@@ -1543,7 +1543,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 f6f3345b0e13 -r 2df2d44272c2 sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC        Fri Dec 09 02:23:25 2016 +0000
+++ b/sys/arch/i386/conf/GENERIC        Fri Dec 09 02:24:17 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1142 2016/12/08 11:31:10 nat Exp $
+# $NetBSD: GENERIC,v 1.1143 2016/12/09 02:24:17 christos Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.1142 $"
+#ident                 "GENERIC-$Revision: 1.1143 $"
 
 maxusers       64              # estimated number of users
 
@@ -1466,7 +1466,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 f6f3345b0e13 -r 2df2d44272c2 sys/arch/i386/conf/GENERIC_TINY
--- a/sys/arch/i386/conf/GENERIC_TINY   Fri Dec 09 02:23:25 2016 +0000
+++ b/sys/arch/i386/conf/GENERIC_TINY   Fri Dec 09 02:24:17 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: GENERIC_TINY,v 1.143 2016/12/08 11:31:10 nat Exp $
+#      $NetBSD: GENERIC_TINY,v 1.144 2016/12/09 02:24:17 christos Exp $
 #
 #      GENERIC_TINY -- suitable default for 4M machines
 #                      No EISA, PCI, or SCSI.
@@ -508,7 +508,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
diff -r f6f3345b0e13 -r 2df2d44272c2 sys/arch/i386/conf/INSTALL_FLOPPY
--- a/sys/arch/i386/conf/INSTALL_FLOPPY Fri Dec 09 02:23:25 2016 +0000
+++ b/sys/arch/i386/conf/INSTALL_FLOPPY Fri Dec 09 02:24:17 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: INSTALL_FLOPPY,v 1.31 2016/12/08 11:31:10 nat Exp $
+#      $NetBSD: INSTALL_FLOPPY,v 1.32 2016/12/09 02:24:17 christos Exp $
 #
 #      INSTALL - Installation kernel.
 #
@@ -710,7 +710,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 f6f3345b0e13 -r 2df2d44272c2 sys/arch/i386/conf/INSTALL_TINY
--- a/sys/arch/i386/conf/INSTALL_TINY   Fri Dec 09 02:23:25 2016 +0000
+++ b/sys/arch/i386/conf/INSTALL_TINY   Fri Dec 09 02:24:17 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: INSTALL_TINY,v 1.145 2016/12/08 11:31:11 nat Exp $
+#      $NetBSD: INSTALL_TINY,v 1.146 2016/12/09 02:24:17 christos Exp $
 #
 #      This kernel should be derived from INSTALL (which is derived
 #      from GENERIC) with some features commented out.
@@ -468,7 +468,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