Module Name: src
Committed By: christos
Date: Fri Dec 9 02:24:17 UTC 2016
Modified Files:
src/sys/arch/i386/conf: ALL GENERIC GENERIC_TINY INSTALL_FLOPPY
INSTALL_TINY
Log Message:
PCPPISPEAKER
To generate a diff of this commit:
cvs rdiff -u -r1.404 -r1.405 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.1142 -r1.1143 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.143 -r1.144 src/sys/arch/i386/conf/GENERIC_TINY
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/i386/conf/INSTALL_FLOPPY
cvs rdiff -u -r1.145 -r1.146 src/sys/arch/i386/conf/INSTALL_TINY
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/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.404 src/sys/arch/i386/conf/ALL:1.405
--- src/sys/arch/i386/conf/ALL:1.404 Thu Dec 8 06:31:10 2016
+++ src/sys/arch/i386/conf/ALL Thu Dec 8 21:24:17 2016
@@ -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 @@ include "arch/i386/conf/std.i386"
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 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/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1142 src/sys/arch/i386/conf/GENERIC:1.1143
--- src/sys/arch/i386/conf/GENERIC:1.1142 Thu Dec 8 06:31:10 2016
+++ src/sys/arch/i386/conf/GENERIC Thu Dec 8 21:24:17 2016
@@ -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 @@ include "arch/i386/conf/std.i386"
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 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/i386/conf/GENERIC_TINY
diff -u src/sys/arch/i386/conf/GENERIC_TINY:1.143 src/sys/arch/i386/conf/GENERIC_TINY:1.144
--- src/sys/arch/i386/conf/GENERIC_TINY:1.143 Thu Dec 8 06:31:10 2016
+++ src/sys/arch/i386/conf/GENERIC_TINY Thu Dec 8 21:24:17 2016
@@ -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 @@ we1 at isa? port 0x300 iomem 0xcc000 irq
#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
Index: src/sys/arch/i386/conf/INSTALL_FLOPPY
diff -u src/sys/arch/i386/conf/INSTALL_FLOPPY:1.31 src/sys/arch/i386/conf/INSTALL_FLOPPY:1.32
--- src/sys/arch/i386/conf/INSTALL_FLOPPY:1.31 Thu Dec 8 06:31:10 2016
+++ src/sys/arch/i386/conf/INSTALL_FLOPPY Thu Dec 8 21:24:17 2016
@@ -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 @@ url* at uhub? port ? # Realtek RTL8150L
#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/i386/conf/INSTALL_TINY
diff -u src/sys/arch/i386/conf/INSTALL_TINY:1.145 src/sys/arch/i386/conf/INSTALL_TINY:1.146
--- src/sys/arch/i386/conf/INSTALL_TINY:1.145 Thu Dec 8 06:31:11 2016
+++ src/sys/arch/i386/conf/INSTALL_TINY Thu Dec 8 21:24:17 2016
@@ -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 @@ we1 at isa? port 0x300 iomem 0xcc000 irq
#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
