Module Name:    src
Committed By:   christos
Date:           Sat Dec 10 23:03:26 UTC 2016

Modified Files:
        src/sys/arch/acorn32/conf: EB7500ATX GENERIC INSTALL LOWMEM_WSCONS NC
        src/sys/arch/alpha/conf: GENERIC
        src/sys/arch/amd64/conf: ALL GENERIC XEN3_DOM0
        src/sys/arch/amiga/conf: AMIGA DRACO GENERIC GENERIC.in MDINSTALL
        src/sys/arch/amigappc/conf: GENERIC NULL
        src/sys/arch/atari/conf: GENERIC.in HADES HADES.in MILAN-ISAIDE
            MILAN-PCIIDE
        src/sys/arch/bebox/conf: GENERIC
        src/sys/arch/cats/conf: GENERIC INSTALL
        src/sys/arch/cobalt/conf: GENERIC INSTALL
        src/sys/arch/dreamcast/conf: GENERIC
        src/sys/arch/epoc32/conf: GENERIC
        src/sys/arch/evbarm/conf: ALLWINNER_A80 ARMADILLO9 BPI CUBIEBOARD
            GUMSTIX HDL_G HPT5325 HUMMINGBIRD_A31 IMX23_OLINUXINO LUBBOCK
            MINI2440 MMNET_GENERIC MPCSA_GENERIC MV2120 RPI SHEEVAPLUG SMDK2410
            TEGRA TS7200 TWINTAIL
        src/sys/arch/evbmips/conf: ALCHEMY LOONGSON MALTA
        src/sys/arch/evbppc/conf: EV64260 OPENBLOCKS266_OPT PMPPC
        src/sys/arch/hp300/conf: GENERIC
        src/sys/arch/hpcarm/conf: NETBOOKPRO WZERO3
        src/sys/arch/hpcmips/conf: GENERIC TX3922 VR41XX
        src/sys/arch/hppa/conf: GENERIC
        src/sys/arch/i386/conf: ALL GENERIC GENERIC_TINY INSTALL_FLOPPY
            INSTALL_TINY XEN3_DOM0
        src/sys/arch/ibmnws/conf: GENERIC
        src/sys/arch/iyonix/conf: GENERIC
        src/sys/arch/landisk/conf: GENERIC
        src/sys/arch/macppc/conf: GENERIC GENERIC_601
        src/sys/arch/mmeye/conf: MMEYE_WLF
        src/sys/arch/netwinder/conf: GENERIC
        src/sys/arch/ofppc/conf: GENERIC
        src/sys/arch/playstation2/conf: DEBUG
        src/sys/arch/pmax/conf: GENERIC GENERIC64 INSTALL INSTALL64
        src/sys/arch/prep/conf: GENERIC
        src/sys/arch/sandpoint/conf: ENCPP1
        src/sys/arch/sgimips/conf: GENERIC32_IP2x GENERIC32_IP3x
        src/sys/arch/shark/conf: GENERIC INSTALL
        src/sys/arch/sparc/conf: INSTALL KRUPS MRCOFFEE TADPOLE3GX
        src/sys/arch/sparc64/conf: GENERIC NONPLUS64
        src/sys/arch/usermode/conf: GENERIC.common
        src/sys/arch/vax/conf: GENERIC
        src/sys/arch/x68k/conf: GENERIC INSTALL
        src/sys/arch/zaurus/conf: GENERIC

Log Message:
remove VAUDIOSPEAKER for now, will be done differently.


To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/sys/arch/acorn32/conf/EB7500ATX
cvs rdiff -u -r1.118 -r1.119 src/sys/arch/acorn32/conf/GENERIC
cvs rdiff -u -r1.74 -r1.75 src/sys/arch/acorn32/conf/INSTALL
cvs rdiff -u -r1.68 -r1.69 src/sys/arch/acorn32/conf/LOWMEM_WSCONS
cvs rdiff -u -r1.67 -r1.68 src/sys/arch/acorn32/conf/NC
cvs rdiff -u -r1.373 -r1.374 src/sys/arch/alpha/conf/GENERIC
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.445 -r1.446 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.121 -r1.122 src/sys/arch/amd64/conf/XEN3_DOM0
cvs rdiff -u -r1.109 -r1.110 src/sys/arch/amiga/conf/AMIGA
cvs rdiff -u -r1.178 -r1.179 src/sys/arch/amiga/conf/DRACO
cvs rdiff -u -r1.312 -r1.313 src/sys/arch/amiga/conf/GENERIC
cvs rdiff -u -r1.130 -r1.131 src/sys/arch/amiga/conf/GENERIC.in
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/amiga/conf/MDINSTALL
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/amigappc/conf/GENERIC
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/amigappc/conf/NULL
cvs rdiff -u -r1.110 -r1.111 src/sys/arch/atari/conf/GENERIC.in
cvs rdiff -u -r1.108 -r1.109 src/sys/arch/atari/conf/HADES
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/atari/conf/HADES.in
cvs rdiff -u -r1.85 -r1.86 src/sys/arch/atari/conf/MILAN-ISAIDE
cvs rdiff -u -r1.89 -r1.90 src/sys/arch/atari/conf/MILAN-PCIIDE
cvs rdiff -u -r1.149 -r1.150 src/sys/arch/bebox/conf/GENERIC
cvs rdiff -u -r1.159 -r1.160 src/sys/arch/cats/conf/GENERIC
cvs rdiff -u -r1.99 -r1.100 src/sys/arch/cats/conf/INSTALL
cvs rdiff -u -r1.149 -r1.150 src/sys/arch/cobalt/conf/GENERIC
cvs rdiff -u -r1.60 -r1.61 src/sys/arch/cobalt/conf/INSTALL
cvs rdiff -u -r1.123 -r1.124 src/sys/arch/dreamcast/conf/GENERIC
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/epoc32/conf/GENERIC
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/evbarm/conf/ALLWINNER_A80 \
    src/sys/arch/evbarm/conf/MINI2440
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/evbarm/conf/ARMADILLO9 \
    src/sys/arch/evbarm/conf/SHEEVAPLUG
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/evbarm/conf/BPI
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/evbarm/conf/CUBIEBOARD
cvs rdiff -u -r1.87 -r1.88 src/sys/arch/evbarm/conf/GUMSTIX
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/evbarm/conf/HDL_G \
    src/sys/arch/evbarm/conf/MPCSA_GENERIC
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/evbarm/conf/HPT5325 \
    src/sys/arch/evbarm/conf/MV2120
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/evbarm/conf/HUMMINGBIRD_A31
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbarm/conf/IMX23_OLINUXINO
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/evbarm/conf/LUBBOCK
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/evbarm/conf/MMNET_GENERIC
cvs rdiff -u -r1.69 -r1.70 src/sys/arch/evbarm/conf/RPI
cvs rdiff -u -r1.60 -r1.61 src/sys/arch/evbarm/conf/SMDK2410
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbarm/conf/TEGRA
cvs rdiff -u -r1.64 -r1.65 src/sys/arch/evbarm/conf/TS7200
cvs rdiff -u -r1.67 -r1.68 src/sys/arch/evbarm/conf/TWINTAIL
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/evbmips/conf/ALCHEMY
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/evbmips/conf/LOONGSON
cvs rdiff -u -r1.83 -r1.84 src/sys/arch/evbmips/conf/MALTA
cvs rdiff -u -r1.65 -r1.66 src/sys/arch/evbppc/conf/EV64260
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/evbppc/conf/OPENBLOCKS266_OPT
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/evbppc/conf/PMPPC
cvs rdiff -u -r1.192 -r1.193 src/sys/arch/hp300/conf/GENERIC
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/hpcarm/conf/NETBOOKPRO
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/hpcarm/conf/WZERO3
cvs rdiff -u -r1.231 -r1.232 src/sys/arch/hpcmips/conf/GENERIC
cvs rdiff -u -r1.103 -r1.104 src/sys/arch/hpcmips/conf/TX3922
cvs rdiff -u -r1.66 -r1.67 src/sys/arch/hpcmips/conf/VR41XX
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/hppa/conf/GENERIC
cvs rdiff -u -r1.405 -r1.406 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.1143 -r1.1144 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.144 -r1.145 src/sys/arch/i386/conf/GENERIC_TINY
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/i386/conf/INSTALL_FLOPPY
cvs rdiff -u -r1.146 -r1.147 src/sys/arch/i386/conf/INSTALL_TINY
cvs rdiff -u -r1.100 -r1.101 src/sys/arch/i386/conf/XEN3_DOM0
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/ibmnws/conf/GENERIC
cvs rdiff -u -r1.91 -r1.92 src/sys/arch/iyonix/conf/GENERIC
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/landisk/conf/GENERIC
cvs rdiff -u -r1.324 -r1.325 src/sys/arch/macppc/conf/GENERIC
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/macppc/conf/GENERIC_601
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/mmeye/conf/MMEYE_WLF
cvs rdiff -u -r1.128 -r1.129 src/sys/arch/netwinder/conf/GENERIC
cvs rdiff -u -r1.159 -r1.160 src/sys/arch/ofppc/conf/GENERIC
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/playstation2/conf/DEBUG
cvs rdiff -u -r1.188 -r1.189 src/sys/arch/pmax/conf/GENERIC
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/pmax/conf/GENERIC64
cvs rdiff -u -r1.72 -r1.73 src/sys/arch/pmax/conf/INSTALL
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/pmax/conf/INSTALL64
cvs rdiff -u -r1.178 -r1.179 src/sys/arch/prep/conf/GENERIC
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/sandpoint/conf/ENCPP1
cvs rdiff -u -r1.106 -r1.107 src/sys/arch/sgimips/conf/GENERIC32_IP2x
cvs rdiff -u -r1.109 -r1.110 src/sys/arch/sgimips/conf/GENERIC32_IP3x
cvs rdiff -u -r1.124 -r1.125 src/sys/arch/shark/conf/GENERIC
cvs rdiff -u -r1.59 -r1.60 src/sys/arch/shark/conf/INSTALL
cvs rdiff -u -r1.93 -r1.94 src/sys/arch/sparc/conf/INSTALL
cvs rdiff -u -r1.70 -r1.71 src/sys/arch/sparc/conf/KRUPS
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/sparc/conf/MRCOFFEE
cvs rdiff -u -r1.68 -r1.69 src/sys/arch/sparc/conf/TADPOLE3GX
cvs rdiff -u -r1.194 -r1.195 src/sys/arch/sparc64/conf/GENERIC
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/sparc64/conf/NONPLUS64
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/usermode/conf/GENERIC.common
cvs rdiff -u -r1.197 -r1.198 src/sys/arch/vax/conf/GENERIC
cvs rdiff -u -r1.181 -r1.182 src/sys/arch/x68k/conf/GENERIC
cvs rdiff -u -r1.110 -r1.111 src/sys/arch/x68k/conf/INSTALL
cvs rdiff -u -r1.68 -r1.69 src/sys/arch/zaurus/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/acorn32/conf/EB7500ATX
diff -u src/sys/arch/acorn32/conf/EB7500ATX:1.59 src/sys/arch/acorn32/conf/EB7500ATX:1.60
--- src/sys/arch/acorn32/conf/EB7500ATX:1.59	Thu Dec  8 06:31:09 2016
+++ src/sys/arch/acorn32/conf/EB7500ATX	Sat Dec 10 18:03:22 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: EB7500ATX,v 1.59 2016/12/08 11:31:09 nat Exp $
+#	$NetBSD: EB7500ATX,v 1.60 2016/12/10 23:03:22 christos Exp $
 #
 #	EB7500ATX --- NetBSD/acorn32 complete configuration
 #
@@ -22,7 +22,7 @@ include		"arch/acorn32/conf/std.acorn32"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"EB7500ATX-$Revision: 1.59 $"
+#ident		"EB7500ATX-$Revision: 1.60 $"
 
 # estimated number of users
 maxusers	32
@@ -222,7 +222,6 @@ pseudo-device	wsmux
 vidcaudio0	at vidc?
 audio*		at vidcaudio0
 
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
 
 rsbus0	at mainbus?

Index: src/sys/arch/acorn32/conf/GENERIC
diff -u src/sys/arch/acorn32/conf/GENERIC:1.118 src/sys/arch/acorn32/conf/GENERIC:1.119
--- src/sys/arch/acorn32/conf/GENERIC:1.118	Thu Dec  8 06:31:09 2016
+++ src/sys/arch/acorn32/conf/GENERIC	Sat Dec 10 18:03:22 2016
@@ -1,4 +1,4 @@
-# 	$NetBSD: GENERIC,v 1.118 2016/12/08 11:31:09 nat Exp $
+# 	$NetBSD: GENERIC,v 1.119 2016/12/10 23:03:22 christos Exp $
 #
 #	GENERIC --- NetBSD/acorn32 complete configuration
 #
@@ -22,7 +22,7 @@ include		"arch/acorn32/conf/std.acorn32"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC-$Revision: 1.118 $"
+#ident		"GENERIC-$Revision: 1.119 $"
 
 # estimated number of users
 maxusers	32
@@ -248,7 +248,6 @@ lpt*	at pioc? offset 0x0278 irq 0	# Old 
 vidcaudio0	at vidc?
 audio*		at vidcaudio0
 
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
 
 # Podule bus device

Index: src/sys/arch/acorn32/conf/INSTALL
diff -u src/sys/arch/acorn32/conf/INSTALL:1.74 src/sys/arch/acorn32/conf/INSTALL:1.75
--- src/sys/arch/acorn32/conf/INSTALL:1.74	Thu Dec  8 06:31:09 2016
+++ src/sys/arch/acorn32/conf/INSTALL	Sat Dec 10 18:03:22 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL,v 1.74 2016/12/08 11:31:09 nat Exp $
+#	$NetBSD: INSTALL,v 1.75 2016/12/10 23:03:22 christos Exp $
 #
 #	INSTALL -- NetBSD/acorn32 install configuration
 #
@@ -22,7 +22,7 @@ include		"arch/acorn32/conf/std.acorn32"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"INSTALL-$Revision: 1.74 $"
+#ident		"INSTALL-$Revision: 1.75 $"
 
 # estimated number of users
 maxusers	32
@@ -240,7 +240,6 @@ lpt*	at pioc? offset 0x0278 irq 0
 vidcaudio0	at vidc?
 audio*		at vidcaudio0
 
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
 
 # Podule bus device

Index: src/sys/arch/acorn32/conf/LOWMEM_WSCONS
diff -u src/sys/arch/acorn32/conf/LOWMEM_WSCONS:1.68 src/sys/arch/acorn32/conf/LOWMEM_WSCONS:1.69
--- src/sys/arch/acorn32/conf/LOWMEM_WSCONS:1.68	Thu Dec  8 06:31:09 2016
+++ src/sys/arch/acorn32/conf/LOWMEM_WSCONS	Sat Dec 10 18:03:22 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: LOWMEM_WSCONS,v 1.68 2016/12/08 11:31:09 nat Exp $
+#	$NetBSD: LOWMEM_WSCONS,v 1.69 2016/12/10 23:03:22 christos Exp $
 #
 #	LOWMEM_WSCONS -- RiscPC config with wscons for SMALL machines
 #
@@ -218,7 +218,6 @@ lpt*	at pioc? offset 0x0278 irq 0
 vidcaudio0	at vidc?
 audio*		at vidcaudio0
 
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
 
 # Podule bus device

Index: src/sys/arch/acorn32/conf/NC
diff -u src/sys/arch/acorn32/conf/NC:1.67 src/sys/arch/acorn32/conf/NC:1.68
--- src/sys/arch/acorn32/conf/NC:1.67	Thu Dec  8 06:31:09 2016
+++ src/sys/arch/acorn32/conf/NC	Sat Dec 10 18:03:22 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: NC,v 1.67 2016/12/08 11:31:09 nat Exp $
+#	$NetBSD: NC,v 1.68 2016/12/10 23:03:22 christos Exp $
 #
 #	NC - with wscons
 #
@@ -210,7 +210,6 @@ lpt*	at pioc? offset 0x0278 irq 0	# Old 
 vidcaudio0	at vidc?
 audio*		at vidcaudio0
 
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
 
 # Podule bus device

Index: src/sys/arch/alpha/conf/GENERIC
diff -u src/sys/arch/alpha/conf/GENERIC:1.373 src/sys/arch/alpha/conf/GENERIC:1.374
--- src/sys/arch/alpha/conf/GENERIC:1.373	Thu Dec  8 21:25:46 2016
+++ src/sys/arch/alpha/conf/GENERIC	Sat Dec 10 18:03:23 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.373 2016/12/09 02:25:46 christos Exp $
+# $NetBSD: GENERIC,v 1.374 2016/12/10 23:03:23 christos Exp $
 #
 # This machine description file is used to generate the default NetBSD
 # kernel.
@@ -19,7 +19,7 @@ include 	"arch/alpha/conf/std.alpha"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-ident		"GENERIC-$Revision: 1.373 $"
+ident		"GENERIC-$Revision: 1.374 $"
 
 maxusers 32
 
@@ -709,7 +709,6 @@ midi*	at midibus?
 midi*	at pcppi?
 midi*	at sb?
 
-#options VAUDIOSPEAKER
 #spkr0	at audio0		# PC speaker (synthesized)
 
 # Workstation Console attachments

Index: src/sys/arch/amd64/conf/ALL
diff -u src/sys/arch/amd64/conf/ALL:1.42 src/sys/arch/amd64/conf/ALL:1.43
--- src/sys/arch/amd64/conf/ALL:1.42	Thu Dec  8 21:23:25 2016
+++ src/sys/arch/amd64/conf/ALL	Sat Dec 10 18:03:23 2016
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.42 2016/12/09 02:23:25 christos Exp $
+# $NetBSD: ALL,v 1.43 2016/12/10 23:03:23 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.42 $"
+#ident 		"ALL-$Revision: 1.43 $"
 
 maxusers	64		# estimated number of users
 
@@ -1377,7 +1377,6 @@ midi*	at pcppi?		# MIDI interface to the
 # The spkr driver provides a simple tone interface to the built in speaker.
 spkr0	at pcppi?		# PC speaker
 
-#options VAUDIOSPEAKER
 #spkr0	at audio0		# PC speaker (synthesized)
 
 

Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.445 src/sys/arch/amd64/conf/GENERIC:1.446
--- src/sys/arch/amd64/conf/GENERIC:1.445	Thu Dec  8 21:23:25 2016
+++ src/sys/arch/amd64/conf/GENERIC	Sat Dec 10 18:03:23 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.445 2016/12/09 02:23:25 christos Exp $
+# $NetBSD: GENERIC,v 1.446 2016/12/10 23:03:23 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.445 $"
+#ident 		"GENERIC-$Revision: 1.446 $"
 
 maxusers	64		# estimated number of users
 
@@ -1111,7 +1111,6 @@ audio*	at audiobus?
 # The spkr driver provides a simple tone interface to the built in speaker.
 spkr0	at pcppi?		# PC speaker
 
-#options VAUDIOSPEAKER
 #spkr0	at audio0		# PC speaker (synthesized)
 
 # MPU 401 UARTs

Index: src/sys/arch/amd64/conf/XEN3_DOM0
diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.121 src/sys/arch/amd64/conf/XEN3_DOM0:1.122
--- src/sys/arch/amd64/conf/XEN3_DOM0:1.121	Thu Dec  8 06:31:09 2016
+++ src/sys/arch/amd64/conf/XEN3_DOM0	Sat Dec 10 18:03:23 2016
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.121 2016/12/08 11:31:09 nat Exp $
+# $NetBSD: XEN3_DOM0,v 1.122 2016/12/10 23:03:23 christos Exp $
 
 include 	"arch/amd64/conf/std.xen"
 
@@ -747,7 +747,6 @@ hdafg*		at hdaudiobus?
 # Audio support
 audio*	at audiobus?
 
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
 
 # MPU 401 UARTs

Index: src/sys/arch/amiga/conf/AMIGA
diff -u src/sys/arch/amiga/conf/AMIGA:1.109 src/sys/arch/amiga/conf/AMIGA:1.110
--- src/sys/arch/amiga/conf/AMIGA:1.109	Thu Dec  8 06:31:09 2016
+++ src/sys/arch/amiga/conf/AMIGA	Sat Dec 10 18:03:23 2016
@@ -1,4 +1,4 @@
-# $NetBSD: AMIGA,v 1.109 2016/12/08 11:31:09 nat Exp $
+# $NetBSD: AMIGA,v 1.110 2016/12/10 23:03:23 christos Exp $
 
 # GENERIC, without DraCo
 #
@@ -24,6 +24,4 @@ no scsibus*	at drsc0
 melody* 	at zbus0		# Melody MPEG audio decoder
 audio*		at melody?
 
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
-

Index: src/sys/arch/amiga/conf/DRACO
diff -u src/sys/arch/amiga/conf/DRACO:1.178 src/sys/arch/amiga/conf/DRACO:1.179
--- src/sys/arch/amiga/conf/DRACO:1.178	Thu Dec  8 06:31:09 2016
+++ src/sys/arch/amiga/conf/DRACO	Sat Dec 10 18:03:23 2016
@@ -1,4 +1,4 @@
-# $NetBSD: DRACO,v 1.178 2016/12/08 11:31:09 nat Exp $
+# $NetBSD: DRACO,v 1.179 2016/12/10 23:03:23 christos Exp $
 #
 # This file was automatically created.
 # Changes will be lost when make is run in this directory.
@@ -29,7 +29,7 @@ include "arch/amiga/conf/std.amiga"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.178 $"
+#ident 		"GENERIC-$Revision: 1.179 $"
 
 makeoptions	COPTS="-O2 -fno-reorder-blocks"	# see share/mk/sys.mk
 
@@ -284,7 +284,6 @@ lpt0		at drsupio? port ?	# DraCo paralle
 repulse*	at zbus0		# ALiENDESiGN Repulse
 audio*		at repulse?
 
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
 
 toccata*	at zbus0		# MacroSystem GmbH Toccata

Index: src/sys/arch/amiga/conf/GENERIC
diff -u src/sys/arch/amiga/conf/GENERIC:1.312 src/sys/arch/amiga/conf/GENERIC:1.313
--- src/sys/arch/amiga/conf/GENERIC:1.312	Thu Dec  8 06:31:09 2016
+++ src/sys/arch/amiga/conf/GENERIC	Sat Dec 10 18:03:23 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.312 2016/12/08 11:31:09 nat Exp $
+# $NetBSD: GENERIC,v 1.313 2016/12/10 23:03:23 christos Exp $
 #
 # This file was automatically created.
 # Changes will be lost when make is run in this directory.
@@ -29,7 +29,7 @@ include "arch/amiga/conf/std.amiga"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.312 $"
+#ident 		"GENERIC-$Revision: 1.313 $"
 
 makeoptions	COPTS="-O2 -fno-reorder-blocks"	# see share/mk/sys.mk
 
@@ -344,7 +344,6 @@ a2kbbc0 	at mainbus0		# A2000 battery ba
 aucc*		at mainbus0		# Amiga CC audio
 audio*		at aucc?
 
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
 
 a1k2cp0         at mainbus0             # A1200 on-board clockport

Index: src/sys/arch/amiga/conf/GENERIC.in
diff -u src/sys/arch/amiga/conf/GENERIC.in:1.130 src/sys/arch/amiga/conf/GENERIC.in:1.131
--- src/sys/arch/amiga/conf/GENERIC.in:1.130	Thu Dec  8 06:31:09 2016
+++ src/sys/arch/amiga/conf/GENERIC.in	Sat Dec 10 18:03:23 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC.in,v 1.130 2016/12/08 11:31:09 nat Exp $
+# $NetBSD: GENERIC.in,v 1.131 2016/12/10 23:03:23 christos Exp $
 #
 ##
 # GENERIC machine description file
@@ -52,7 +52,7 @@ include "arch/amiga/conf/std.amiga"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.130 $"
+#ident 		"GENERIC-$Revision: 1.131 $"
 
 m4_ifdef(`INSTALL_CONFIGURATION', `m4_dnl
 makeoptions	COPTS="-Os"
@@ -414,7 +414,6 @@ m4_ifdef(`INSTALL_CONFIGURATION', `', `m
 aucc*		at mainbus0		# Amiga CC audio
 audio*		at aucc?
 
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
 
 a1k2cp0         at mainbus0             # A1200 on-board clockport

Index: src/sys/arch/amiga/conf/MDINSTALL
diff -u src/sys/arch/amiga/conf/MDINSTALL:1.33 src/sys/arch/amiga/conf/MDINSTALL:1.34
--- src/sys/arch/amiga/conf/MDINSTALL:1.33	Thu Dec  8 06:31:09 2016
+++ src/sys/arch/amiga/conf/MDINSTALL	Sat Dec 10 18:03:23 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: MDINSTALL,v 1.33 2016/12/08 11:31:09 nat Exp $
+#	$NetBSD: MDINSTALL,v 1.34 2016/12/10 23:03:23 christos Exp $
 
 #
 # INSTALL kernel for ramdisk installation
@@ -185,7 +185,6 @@ a2kbbc0 	at mainbus0		# A2000 battery ba
 aucc*		at mainbus0		# Amiga CC audio
 audio*		at aucc?
 
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
 
 #

Index: src/sys/arch/amigappc/conf/GENERIC
diff -u src/sys/arch/amigappc/conf/GENERIC:1.27 src/sys/arch/amigappc/conf/GENERIC:1.28
--- src/sys/arch/amigappc/conf/GENERIC:1.27	Thu Dec  8 06:31:09 2016
+++ src/sys/arch/amigappc/conf/GENERIC	Sat Dec 10 18:03:23 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.27 2016/12/08 11:31:09 nat Exp $
+# $NetBSD: GENERIC,v 1.28 2016/12/10 23:03:23 christos Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include "arch/amigappc/conf/std.amigappc
 
 options 	INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident          "GENERIC-$Revision: 1.27 $"
+#ident          "GENERIC-$Revision: 1.28 $"
 
 maxusers	8
 
@@ -224,7 +224,6 @@ a34kbbc0	at mainbus0		# A3000/A4000 batt
 aucc*		at mainbus0		# Amiga CC audio
 audio*		at aucc?
 
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
 
 # wscons aware interface to amiga custom chips.

Index: src/sys/arch/amigappc/conf/NULL
diff -u src/sys/arch/amigappc/conf/NULL:1.47 src/sys/arch/amigappc/conf/NULL:1.48
--- src/sys/arch/amigappc/conf/NULL:1.47	Thu Dec  8 06:31:09 2016
+++ src/sys/arch/amigappc/conf/NULL	Sat Dec 10 18:03:23 2016
@@ -1,4 +1,4 @@
-# $NetBSD: NULL,v 1.47 2016/12/08 11:31:09 nat Exp $
+# $NetBSD: NULL,v 1.48 2016/12/10 23:03:23 christos Exp $
 #
 # NULL machine description file
 # 
@@ -7,7 +7,7 @@ include "arch/amigappc/conf/std.amigappc
 
 #options 	INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident          "GENERIC-$Revision: 1.47 $"
+#ident          "GENERIC-$Revision: 1.48 $"
 
 maxusers	8
 
@@ -209,7 +209,6 @@ fd*		at fdc0 unit ?		# floppy disks on t
 #aucc*		at mainbus0		# Amiga CC audio
 #audio*		at aucc?
 
-#options VAUDIOSPEAKER
 #spkr0	at audio0		# PC speaker (synthesized)
 
 # wscons aware interface to amiga custom chips.

Index: src/sys/arch/atari/conf/GENERIC.in
diff -u src/sys/arch/atari/conf/GENERIC.in:1.110 src/sys/arch/atari/conf/GENERIC.in:1.111
--- src/sys/arch/atari/conf/GENERIC.in:1.110	Thu Dec  8 06:31:09 2016
+++ src/sys/arch/atari/conf/GENERIC.in	Sat Dec 10 18:03:23 2016
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: GENERIC.in,v 1.110 2016/12/08 11:31:09 nat Exp $
+#	$NetBSD: GENERIC.in,v 1.111 2016/12/10 23:03:23 christos Exp $
 #
 # Generic atari
 #
@@ -319,7 +319,6 @@ fxp*	at pci? dev ? function ?	# Intel Et
 eso*	at pci? dev ? function ?	# ESS Solo-1 PCI AudioDrive
 audio*	at eso?
 
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
 
 #endif /* defined(HADES_KERNEL) || defined(MILAN_KERNEL) */

Index: src/sys/arch/atari/conf/HADES
diff -u src/sys/arch/atari/conf/HADES:1.108 src/sys/arch/atari/conf/HADES:1.109
--- src/sys/arch/atari/conf/HADES:1.108	Thu Dec  8 06:31:09 2016
+++ src/sys/arch/atari/conf/HADES	Sat Dec 10 18:03:23 2016
@@ -1,5 +1,5 @@
 #
-# $NetBSD: HADES,v 1.108 2016/12/08 11:31:09 nat Exp $
+# $NetBSD: HADES,v 1.109 2016/12/10 23:03:23 christos Exp $
 #
 # This file was automatically created. Changes will be
 # lost when running makeconf in this directory.
@@ -92,7 +92,6 @@ fxp* at pci? dev ? function ? # Intel Et
 eso* at pci? dev ? function ? # ESS Solo-1 PCI AudioDrive
 audio* at eso?
 
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
 
 pseudo-device view 4 # View (graphics mapping)

Index: src/sys/arch/atari/conf/HADES.in
diff -u src/sys/arch/atari/conf/HADES.in:1.13 src/sys/arch/atari/conf/HADES.in:1.14
--- src/sys/arch/atari/conf/HADES.in:1.13	Thu Dec  8 06:31:09 2016
+++ src/sys/arch/atari/conf/HADES.in	Sat Dec 10 18:03:23 2016
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: HADES.in,v 1.13 2016/12/08 11:31:09 nat Exp $
+#	$NetBSD: HADES.in,v 1.14 2016/12/10 23:03:23 christos Exp $
 #
 # Medusa-Hades
 #
@@ -70,7 +70,6 @@ ep*	at pci0 dev ? function 0	# 3Com 3c59
 eso*	at pci? dev ? function ?	# ESS Solo-1 PCI AudioDrive
 audio*	at eso?
 
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
 
 #endif /* SMALL030_KERNEL */

Index: src/sys/arch/atari/conf/MILAN-ISAIDE
diff -u src/sys/arch/atari/conf/MILAN-ISAIDE:1.85 src/sys/arch/atari/conf/MILAN-ISAIDE:1.86
--- src/sys/arch/atari/conf/MILAN-ISAIDE:1.85	Thu Dec  8 06:31:09 2016
+++ src/sys/arch/atari/conf/MILAN-ISAIDE	Sat Dec 10 18:03:23 2016
@@ -1,5 +1,5 @@
 #
-# $NetBSD: MILAN-ISAIDE,v 1.85 2016/12/08 11:31:09 nat Exp $
+# $NetBSD: MILAN-ISAIDE,v 1.86 2016/12/10 23:03:23 christos Exp $
 #
 # This file was automatically created. Changes will be
 # lost when running makeconf in this directory.
@@ -90,7 +90,6 @@ fxp* at pci? dev ? function ? # Intel Et
 eso* at pci? dev ? function ? # ESS Solo-1 PCI AudioDrive
 audio* at eso?
 
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
 
 options WSEMUL_VT100 # VT100 / VT220 emulation

Index: src/sys/arch/atari/conf/MILAN-PCIIDE
diff -u src/sys/arch/atari/conf/MILAN-PCIIDE:1.89 src/sys/arch/atari/conf/MILAN-PCIIDE:1.90
--- src/sys/arch/atari/conf/MILAN-PCIIDE:1.89	Thu Dec  8 06:31:09 2016
+++ src/sys/arch/atari/conf/MILAN-PCIIDE	Sat Dec 10 18:03:23 2016
@@ -1,5 +1,5 @@
 #
-# $NetBSD: MILAN-PCIIDE,v 1.89 2016/12/08 11:31:09 nat Exp $
+# $NetBSD: MILAN-PCIIDE,v 1.90 2016/12/10 23:03:23 christos Exp $
 #
 # This file was automatically created. Changes will be
 # lost when running makeconf in this directory.
@@ -90,7 +90,6 @@ fxp* at pci? dev ? function ? # Intel Et
 eso* at pci? dev ? function ? # ESS Solo-1 PCI AudioDrive
 audio* at eso?
 
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
 
 options WSEMUL_VT100 # VT100 / VT220 emulation

Index: src/sys/arch/bebox/conf/GENERIC
diff -u src/sys/arch/bebox/conf/GENERIC:1.149 src/sys/arch/bebox/conf/GENERIC:1.150
--- src/sys/arch/bebox/conf/GENERIC:1.149	Thu Dec  8 21:25:46 2016
+++ src/sys/arch/bebox/conf/GENERIC	Sat Dec 10 18:03:23 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.149 2016/12/09 02:25:46 christos Exp $
+# $NetBSD: GENERIC,v 1.150 2016/12/10 23:03:23 christos Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include 	"arch/bebox/conf/std.bebox"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.149 $"
+#ident 		"GENERIC-$Revision: 1.150 $"
 
 maxusers	32
 
@@ -209,7 +209,6 @@ wss0	at isa? port 0x82c irq 30 drq 6 drq
 # Audio support
 audio*	at audiobus?
 
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
 
 # MIDI support

Index: src/sys/arch/cats/conf/GENERIC
diff -u src/sys/arch/cats/conf/GENERIC:1.159 src/sys/arch/cats/conf/GENERIC:1.160
--- src/sys/arch/cats/conf/GENERIC:1.159	Thu Dec  8 21:25:46 2016
+++ src/sys/arch/cats/conf/GENERIC	Sat Dec 10 18:03:23 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.159 2016/12/09 02:25:46 christos Exp $
+# $NetBSD: GENERIC,v 1.160 2016/12/10 23:03:23 christos Exp $
 #
 # GENERIC machine description file
 # 
@@ -504,7 +504,6 @@ lpt1	at isa? port 0x278 irq 5
 # The spkr driver provides a simple tone interface to the built in speaker.
 spkr0	at pcppi?			# PC speaker
 
-#options VAUDIOSPEAKER
 #spkr0	at audio0		# PC speaker (synthesized)
 
 ds1687rtc0	at isa? port 0x72	# Dallas 1687 RTC

Index: src/sys/arch/cats/conf/INSTALL
diff -u src/sys/arch/cats/conf/INSTALL:1.99 src/sys/arch/cats/conf/INSTALL:1.100
--- src/sys/arch/cats/conf/INSTALL:1.99	Thu Dec  8 21:25:46 2016
+++ src/sys/arch/cats/conf/INSTALL	Sat Dec 10 18:03:23 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL,v 1.99 2016/12/09 02:25:46 christos Exp $
+#	$NetBSD: INSTALL,v 1.100 2016/12/10 23:03:23 christos Exp $
 #
 #	CATSINST -- CHALTECH CATS Install kernel
 #
@@ -400,7 +400,6 @@ lpt1	at isa? port 0x278 irq 5
 # The spkr driver provides a simple tone interface to the built in speaker.
 #spkr0	at pcppi?			# PC speaker
 
-#options VAUDIOSPEAKER
 #spkr0	at audio0		# PC speaker (synthesized)
 
 ds1687rtc0	at isa? port 0x72	# Dallas RTC

Index: src/sys/arch/cobalt/conf/GENERIC
diff -u src/sys/arch/cobalt/conf/GENERIC:1.149 src/sys/arch/cobalt/conf/GENERIC:1.150
--- src/sys/arch/cobalt/conf/GENERIC:1.149	Thu Dec  8 06:31:09 2016
+++ src/sys/arch/cobalt/conf/GENERIC	Sat Dec 10 18:03:23 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.149 2016/12/08 11:31:09 nat Exp $
+# $NetBSD: GENERIC,v 1.150 2016/12/10 23:03:23 christos Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include 	"arch/cobalt/conf/std.cobalt"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.149 $"
+#ident 		"GENERIC-$Revision: 1.150 $"
 
 maxusers	32
 
@@ -306,7 +306,6 @@ lxtphy*		at mii? phy ?			# Level One LXT
 # Audio support
 #audio*		at audiobus?
 
-#options VAUDIOSPEAKER
 #spkr0	at audio0		# PC speaker (synthesized)
 
 # Pseudo-devices

Index: src/sys/arch/cobalt/conf/INSTALL
diff -u src/sys/arch/cobalt/conf/INSTALL:1.60 src/sys/arch/cobalt/conf/INSTALL:1.61
--- src/sys/arch/cobalt/conf/INSTALL:1.60	Thu Dec  8 06:31:09 2016
+++ src/sys/arch/cobalt/conf/INSTALL	Sat Dec 10 18:03:23 2016
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.60 2016/12/08 11:31:09 nat Exp $
+# $NetBSD: INSTALL,v 1.61 2016/12/10 23:03:23 christos Exp $
 #
 # INSTALL -- installation and rescue kernel.
 #
@@ -10,7 +10,7 @@ include 	"arch/cobalt/conf/std.cobalt"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"INSTALL-$Revision: 1.60 $"
+#ident 		"INSTALL-$Revision: 1.61 $"
 
 makeoptions     COPTS="-Os -mmemcpy"
 makeoptions	CPUFLAGS="-march=vr5000 -mabi=32"
@@ -283,7 +283,6 @@ lxtphy*		at mii? phy ?			# Level One LXT
 # Audio support
 #audio*		at audiobus?
 
-#options VAUDIOSPEAKER
 #spkr0	at audio0		# PC speaker (synthesized)
 
 # Pseudo-devices

Index: src/sys/arch/dreamcast/conf/GENERIC
diff -u src/sys/arch/dreamcast/conf/GENERIC:1.123 src/sys/arch/dreamcast/conf/GENERIC:1.124
--- src/sys/arch/dreamcast/conf/GENERIC:1.123	Thu Dec  8 06:31:10 2016
+++ src/sys/arch/dreamcast/conf/GENERIC	Sat Dec 10 18:03:23 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.123 2016/12/08 11:31:10 nat Exp $
+# $NetBSD: GENERIC,v 1.124 2016/12/10 23:03:23 christos Exp $
 #
 # GENERIC machine description file
 # 
@@ -193,7 +193,6 @@ mbe*		at g2bus?			# SEGA LAN Adapter
 aica*		at g2bus?			# AICA Sound Processing Unit
 audio*		at aica?
 
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
 
 #pseudo-device	cgd			# cryptographic disk devices

Index: src/sys/arch/epoc32/conf/GENERIC
diff -u src/sys/arch/epoc32/conf/GENERIC:1.9 src/sys/arch/epoc32/conf/GENERIC:1.10
--- src/sys/arch/epoc32/conf/GENERIC:1.9	Thu Dec  8 06:31:10 2016
+++ src/sys/arch/epoc32/conf/GENERIC	Sat Dec 10 18:03:23 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC,v 1.9 2016/12/08 11:31:10 nat Exp $
+#	$NetBSD: GENERIC,v 1.10 2016/12/10 23:03:23 christos Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include		"arch/epoc32/conf/std.epoc32"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.9 $"
+#ident 		"GENERIC-$Revision: 1.10 $"
 
 maxusers	32			# estimated number of users
 
@@ -168,7 +168,6 @@ wskbd*	at epockbd?
 
 #audio* at audio?
 
-#options VAUDIOSPEAKER
 #spkr0	at audio0		# PC speaker (synthesized)
 
 # External devices

Index: src/sys/arch/evbarm/conf/ALLWINNER_A80
diff -u src/sys/arch/evbarm/conf/ALLWINNER_A80:1.17 src/sys/arch/evbarm/conf/ALLWINNER_A80:1.18
--- src/sys/arch/evbarm/conf/ALLWINNER_A80:1.17	Thu Dec  8 06:31:10 2016
+++ src/sys/arch/evbarm/conf/ALLWINNER_A80	Sat Dec 10 18:03:23 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: ALLWINNER_A80,v 1.17 2016/12/08 11:31:10 nat Exp $
+#	$NetBSD: ALLWINNER_A80,v 1.18 2016/12/10 23:03:23 christos Exp $
 #
 #	ALLWINNER_A80 - Allwinner A80 boards (Cubieboard4, OptimusBoard, etc)
 #
@@ -102,7 +102,6 @@ awge0		at awinio0 port ?
 #awinhdmiaudio0	at awinio0
 #audio1		at awinhdmiaudio0
 
-#options VAUDIOSPEAKER
 #spkr0	at audio0		# PC speaker (synthesized)
 
 # TCON
Index: src/sys/arch/evbarm/conf/MINI2440
diff -u src/sys/arch/evbarm/conf/MINI2440:1.17 src/sys/arch/evbarm/conf/MINI2440:1.18
--- src/sys/arch/evbarm/conf/MINI2440:1.17	Thu Dec  8 06:31:10 2016
+++ src/sys/arch/evbarm/conf/MINI2440	Sat Dec 10 18:03:23 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: MINI2440,v 1.17 2016/12/08 11:31:10 nat Exp $
+#	$NetBSD: MINI2440,v 1.18 2016/12/10 23:03:23 christos Exp $
 #
 #	MINI2440 -- Friendly ARM evaluation board based on Samsung S3C2440
 #
@@ -240,7 +240,6 @@ sd*	at scsibus? target ? lun ?	# SCSI di
 # Audio support
 audio*	at audiobus?
 
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
 
 dme0     at ssextio? intr 7 addr 0x20000300

Index: src/sys/arch/evbarm/conf/ARMADILLO9
diff -u src/sys/arch/evbarm/conf/ARMADILLO9:1.50 src/sys/arch/evbarm/conf/ARMADILLO9:1.51
--- src/sys/arch/evbarm/conf/ARMADILLO9:1.50	Thu Dec  8 06:31:10 2016
+++ src/sys/arch/evbarm/conf/ARMADILLO9	Sat Dec 10 18:03:23 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: ARMADILLO9,v 1.50 2016/12/08 11:31:10 nat Exp $
+#	$NetBSD: ARMADILLO9,v 1.51 2016/12/10 23:03:23 christos Exp $
 #
 #	ARMADILLO9 -- Atmark Techno, Armadillo-9
 #
@@ -251,7 +251,6 @@ uk*	at scsibus? target ? lun ?	# SCSI un
 # Audio support
 #audio*	at audiobus?
 
-#options VAUDIOSPEAKER
 #spkr0	at audio0		# PC speaker (synthesized)
 
 # MIDI support
Index: src/sys/arch/evbarm/conf/SHEEVAPLUG
diff -u src/sys/arch/evbarm/conf/SHEEVAPLUG:1.50 src/sys/arch/evbarm/conf/SHEEVAPLUG:1.51
--- src/sys/arch/evbarm/conf/SHEEVAPLUG:1.50	Thu Dec  8 06:31:10 2016
+++ src/sys/arch/evbarm/conf/SHEEVAPLUG	Sat Dec 10 18:03:24 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: SHEEVAPLUG,v 1.50 2016/12/08 11:31:10 nat Exp $
+#	$NetBSD: SHEEVAPLUG,v 1.51 2016/12/10 23:03:24 christos Exp $
 #
 #  This configuration supports for generically Marvell SheevaPlug
 #
@@ -437,7 +437,6 @@ mvsocrtc* at mvsoc? offset ? irq ?
 # Audio support
 audio*	at audiobus?
 
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
 
 # Pseudo-Devices

Index: src/sys/arch/evbarm/conf/BPI
diff -u src/sys/arch/evbarm/conf/BPI:1.18 src/sys/arch/evbarm/conf/BPI:1.19
--- src/sys/arch/evbarm/conf/BPI:1.18	Thu Dec  8 06:31:10 2016
+++ src/sys/arch/evbarm/conf/BPI	Sat Dec 10 18:03:23 2016
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: BPI,v 1.18 2016/12/08 11:31:10 nat Exp $
+#	$NetBSD: BPI,v 1.19 2016/12/10 23:03:23 christos Exp $
 #
 #	BPI -- Banana Pi - an Allwinner A20 Eval Board Kernel
 #
@@ -138,7 +138,6 @@ awinhdmi0       at awinio0
 awinhdmiaudio0	at awinio0
 audio1		at awinhdmiaudio0
  
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
 
 # TCON

Index: src/sys/arch/evbarm/conf/CUBIEBOARD
diff -u src/sys/arch/evbarm/conf/CUBIEBOARD:1.47 src/sys/arch/evbarm/conf/CUBIEBOARD:1.48
--- src/sys/arch/evbarm/conf/CUBIEBOARD:1.47	Thu Dec  8 06:31:10 2016
+++ src/sys/arch/evbarm/conf/CUBIEBOARD	Sat Dec 10 18:03:23 2016
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: CUBIEBOARD,v 1.47 2016/12/08 11:31:10 nat Exp $
+#	$NetBSD: CUBIEBOARD,v 1.48 2016/12/10 23:03:23 christos Exp $
 #
 #	CUBIEBOARD -- Allwinner A10/A20 Eval Board Kernel
 #
@@ -133,7 +133,6 @@ awinhdmi0       at awinio0
 awinhdmiaudio0	at awinio0
 audio1		at awinhdmiaudio0
 
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
 
 # TCON

Index: src/sys/arch/evbarm/conf/GUMSTIX
diff -u src/sys/arch/evbarm/conf/GUMSTIX:1.87 src/sys/arch/evbarm/conf/GUMSTIX:1.88
--- src/sys/arch/evbarm/conf/GUMSTIX:1.87	Thu Dec  8 06:31:10 2016
+++ src/sys/arch/evbarm/conf/GUMSTIX	Sat Dec 10 18:03:23 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: GUMSTIX,v 1.87 2016/12/08 11:31:10 nat Exp $
+#	$NetBSD: GUMSTIX,v 1.88 2016/12/10 23:03:23 christos Exp $
 #
 #	GUMSTIX -- Gumstix. Inc. gumstix platforms kernel
 #
@@ -204,7 +204,6 @@ pxaacu0	at pxaip? addr 0x40500000 intr 1
 # Audio support
 audio*	at audiobus?
 
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
 
 # LCD

Index: src/sys/arch/evbarm/conf/HDL_G
diff -u src/sys/arch/evbarm/conf/HDL_G:1.46 src/sys/arch/evbarm/conf/HDL_G:1.47
--- src/sys/arch/evbarm/conf/HDL_G:1.46	Thu Dec  8 06:31:10 2016
+++ src/sys/arch/evbarm/conf/HDL_G	Sat Dec 10 18:03:23 2016
@@ -1,4 +1,4 @@
-# $NetBSD: HDL_G,v 1.46 2016/12/08 11:31:10 nat Exp $
+# $NetBSD: HDL_G,v 1.47 2016/12/10 23:03:23 christos Exp $
 #
 #       HDL_G -- I-O DATA HDL-G Kernel
 #
@@ -377,7 +377,6 @@ ugen*	at uhub? port ?
 # Audio support
 audio*  at audiobus?
 
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
 
 # MIDI support
Index: src/sys/arch/evbarm/conf/MPCSA_GENERIC
diff -u src/sys/arch/evbarm/conf/MPCSA_GENERIC:1.46 src/sys/arch/evbarm/conf/MPCSA_GENERIC:1.47
--- src/sys/arch/evbarm/conf/MPCSA_GENERIC:1.46	Thu Dec  8 06:31:10 2016
+++ src/sys/arch/evbarm/conf/MPCSA_GENERIC	Sat Dec 10 18:03:24 2016
@@ -1,4 +1,4 @@
-# $NetBSD: MPCSA_GENERIC,v 1.46 2016/12/08 11:31:10 nat Exp $
+# $NetBSD: MPCSA_GENERIC,v 1.47 2016/12/10 23:03:24 christos Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include		"arch/evbarm/conf/std.mpcsa"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.46 $"
+#ident 		"GENERIC-$Revision: 1.47 $"
 
 maxusers	32		# estimated number of users
 
@@ -576,7 +576,6 @@ ucom*	at uvscom? portno ?
 # Audio support
 #audio*	at audiobus?
 
-#options VAUDIOSPEAKER
 #spkr0	at audio0		# PC speaker (synthesized)
 
 # MIDI support

Index: src/sys/arch/evbarm/conf/HPT5325
diff -u src/sys/arch/evbarm/conf/HPT5325:1.28 src/sys/arch/evbarm/conf/HPT5325:1.29
--- src/sys/arch/evbarm/conf/HPT5325:1.28	Thu Dec  8 06:31:10 2016
+++ src/sys/arch/evbarm/conf/HPT5325	Sat Dec 10 18:03:23 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: HPT5325,v 1.28 2016/12/08 11:31:10 nat Exp $
+#	$NetBSD: HPT5325,v 1.29 2016/12/10 23:03:23 christos Exp $
 #
 #  This configuration supports for HP T5325 Thin Client
 #
@@ -436,7 +436,6 @@ mvsocrtc* at mvsoc? offset ? irq ?
 # Audio support
 audio*	at audiobus?
 
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
 
 # Pseudo-Devices
Index: src/sys/arch/evbarm/conf/MV2120
diff -u src/sys/arch/evbarm/conf/MV2120:1.28 src/sys/arch/evbarm/conf/MV2120:1.29
--- src/sys/arch/evbarm/conf/MV2120:1.28	Thu Dec  8 06:31:10 2016
+++ src/sys/arch/evbarm/conf/MV2120	Sat Dec 10 18:03:24 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: MV2120,v 1.28 2016/12/08 11:31:10 nat Exp $
+#	$NetBSD: MV2120,v 1.29 2016/12/10 23:03:24 christos Exp $
 #
 #  This configuration supports for HP MV2120/MV5140/MV5150.
 
@@ -251,7 +251,6 @@ include "dev/bluetooth/bluetoothdevices.
 audio*  at audiobus?
 midi*   at midibus?
 
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
 
 # Pseudo-Devices

Index: src/sys/arch/evbarm/conf/HUMMINGBIRD_A31
diff -u src/sys/arch/evbarm/conf/HUMMINGBIRD_A31:1.25 src/sys/arch/evbarm/conf/HUMMINGBIRD_A31:1.26
--- src/sys/arch/evbarm/conf/HUMMINGBIRD_A31:1.25	Thu Dec  8 06:31:10 2016
+++ src/sys/arch/evbarm/conf/HUMMINGBIRD_A31	Sat Dec 10 18:03:23 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: HUMMINGBIRD_A31,v 1.25 2016/12/08 11:31:10 nat Exp $
+#	$NetBSD: HUMMINGBIRD_A31,v 1.26 2016/12/10 23:03:23 christos Exp $
 #
 #	HUMMINGBIRD_A31 - Merrii Hummingbird A31
 #
@@ -95,7 +95,6 @@ awinhdmi0	at awinio0
 awinhdmiaudio0	at awinio0
 audio1		at awinhdmiaudio0
 
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
 
 # TCON

Index: src/sys/arch/evbarm/conf/IMX23_OLINUXINO
diff -u src/sys/arch/evbarm/conf/IMX23_OLINUXINO:1.13 src/sys/arch/evbarm/conf/IMX23_OLINUXINO:1.14
--- src/sys/arch/evbarm/conf/IMX23_OLINUXINO:1.13	Thu Dec  8 06:31:10 2016
+++ src/sys/arch/evbarm/conf/IMX23_OLINUXINO	Sat Dec 10 18:03:23 2016
@@ -1,4 +1,4 @@
-# $Id: IMX23_OLINUXINO,v 1.13 2016/12/08 11:31:10 nat Exp $
+# $Id: IMX23_OLINUXINO,v 1.14 2016/12/10 23:03:23 christos Exp $
 #
 # IMX23_OLINUXINO -- Olimex i.MX23 OLinuXino kernel configuration file.
 #
@@ -73,7 +73,6 @@ rtc0		at apbx? addr 0x8005C000 size 0x20
 digfilt0	at apbx? addr 0x80048000 size 0x8000 irq -1
 audio0		at digfilt0
 
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
 
 # USB host

Index: src/sys/arch/evbarm/conf/LUBBOCK
diff -u src/sys/arch/evbarm/conf/LUBBOCK:1.55 src/sys/arch/evbarm/conf/LUBBOCK:1.56
--- src/sys/arch/evbarm/conf/LUBBOCK:1.55	Thu Dec  8 06:31:10 2016
+++ src/sys/arch/evbarm/conf/LUBBOCK	Sat Dec 10 18:03:23 2016
@@ -160,7 +160,6 @@ options 	PXA2X0_DMAC_DMOVER_CONCURRENCY=
 pxaacu0 	at pxaip? addr 0x40500000 intr 14
 audio*		at audiobus?
 
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
 
 # On-board device support

Index: src/sys/arch/evbarm/conf/MMNET_GENERIC
diff -u src/sys/arch/evbarm/conf/MMNET_GENERIC:1.24 src/sys/arch/evbarm/conf/MMNET_GENERIC:1.25
--- src/sys/arch/evbarm/conf/MMNET_GENERIC:1.24	Thu Dec  8 06:31:10 2016
+++ src/sys/arch/evbarm/conf/MMNET_GENERIC	Sat Dec 10 18:03:24 2016
@@ -1,4 +1,4 @@
-# $NetBSD: MMNET_GENERIC,v 1.24 2016/12/08 11:31:10 nat Exp $
+# $NetBSD: MMNET_GENERIC,v 1.25 2016/12/10 23:03:24 christos Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include		"arch/evbarm/conf/std.mmnet"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.24 $"
+#ident 		"GENERIC-$Revision: 1.25 $"
 
 maxusers	32		# estimated number of users
 
@@ -519,7 +519,6 @@ ucom*	at uvscom? portno ?
 # Audio support
 #audio*	at audiobus?
 
-#options VAUDIOSPEAKER
 #spkr0	at audio0		# PC speaker (synthesized)
 
 # MIDI support

Index: src/sys/arch/evbarm/conf/RPI
diff -u src/sys/arch/evbarm/conf/RPI:1.69 src/sys/arch/evbarm/conf/RPI:1.70
--- src/sys/arch/evbarm/conf/RPI:1.69	Thu Dec  8 06:31:10 2016
+++ src/sys/arch/evbarm/conf/RPI	Sat Dec 10 18:03:24 2016
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: RPI,v 1.69 2016/12/08 11:31:10 nat Exp $
+#	$NetBSD: RPI,v 1.70 2016/12/10 23:03:24 christos Exp $
 #
 #	RPi -- Raspberry Pi
 #
@@ -68,7 +68,6 @@ vchiq0		at obio?
 vcaudio0	at vchiq0
 audio0		at vcaudio0
 
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
 
 # PL011 uart

Index: src/sys/arch/evbarm/conf/SMDK2410
diff -u src/sys/arch/evbarm/conf/SMDK2410:1.60 src/sys/arch/evbarm/conf/SMDK2410:1.61
--- src/sys/arch/evbarm/conf/SMDK2410:1.60	Thu Dec  8 06:31:10 2016
+++ src/sys/arch/evbarm/conf/SMDK2410	Sat Dec 10 18:03:24 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: SMDK2410,v 1.60 2016/12/08 11:31:10 nat Exp $
+#	$NetBSD: SMDK2410,v 1.61 2016/12/10 23:03:24 christos Exp $
 #
 #	SMDK2410 -- Samsung's S3C2410 evaluation board.
 #
@@ -214,7 +214,6 @@ midi*	at midibus?
 # Audio support
 audio*	at audiobus?
 
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
 
 # on-board CS8900A Ethernet

Index: src/sys/arch/evbarm/conf/TEGRA
diff -u src/sys/arch/evbarm/conf/TEGRA:1.8 src/sys/arch/evbarm/conf/TEGRA:1.9
--- src/sys/arch/evbarm/conf/TEGRA:1.8	Thu Dec  8 06:31:10 2016
+++ src/sys/arch/evbarm/conf/TEGRA	Sat Dec 10 18:03:24 2016
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: TEGRA,v 1.8 2016/12/08 11:31:10 nat Exp $
+#	$NetBSD: TEGRA,v 1.9 2016/12/10 23:03:24 christos Exp $
 #
 #	NVIDIA Tegra K1 (T124)
 #
@@ -125,7 +125,6 @@ options 	HDAUDIO_32BIT_ACCESS
 options 	HDAUDIO_ENABLE_HDMI
 options 	HDAUDIO_ENABLE_DISPLAYPORT
 
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
 
 # HDMI CEC

Index: src/sys/arch/evbarm/conf/TS7200
diff -u src/sys/arch/evbarm/conf/TS7200:1.64 src/sys/arch/evbarm/conf/TS7200:1.65
--- src/sys/arch/evbarm/conf/TS7200:1.64	Thu Dec  8 06:31:10 2016
+++ src/sys/arch/evbarm/conf/TS7200	Sat Dec 10 18:03:24 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: TS7200,v 1.64 2016/12/08 11:31:10 nat Exp $
+#	$NetBSD: TS7200,v 1.65 2016/12/10 23:03:24 christos Exp $
 #
 #	TS7200 - Kernel for Technologic Systems TS7200 ARM hardware
 #
@@ -425,7 +425,6 @@ ugen*	at uhub? port ?
 # Audio support
 #audio*	at audiobus?
 
-#options VAUDIOSPEAKER
 #spkr0	at audio0		# PC speaker (synthesized)
 
 # MPU 401 UARTs

Index: src/sys/arch/evbarm/conf/TWINTAIL
diff -u src/sys/arch/evbarm/conf/TWINTAIL:1.67 src/sys/arch/evbarm/conf/TWINTAIL:1.68
--- src/sys/arch/evbarm/conf/TWINTAIL:1.67	Thu Dec  8 06:31:10 2016
+++ src/sys/arch/evbarm/conf/TWINTAIL	Sat Dec 10 18:03:24 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: TWINTAIL,v 1.67 2016/12/08 11:31:10 nat Exp $
+#	$NetBSD: TWINTAIL,v 1.68 2016/12/10 23:03:24 christos Exp $
 #
 #	TWINTAIL -- Genetec corp. G4255EB-X002 Evaluation Board Kernel
 #
@@ -167,7 +167,6 @@ options KGDB_DEVRATE=115200
 # Audio support
 #audio*	at audiobus?
 
-#options VAUDIOSPEAKER
 #spkr0	at audio0		# PC speaker (synthesized)
 
 # FlashROM disk driver

Index: src/sys/arch/evbmips/conf/ALCHEMY
diff -u src/sys/arch/evbmips/conf/ALCHEMY:1.58 src/sys/arch/evbmips/conf/ALCHEMY:1.59
--- src/sys/arch/evbmips/conf/ALCHEMY:1.58	Thu Dec  8 06:31:10 2016
+++ src/sys/arch/evbmips/conf/ALCHEMY	Sat Dec 10 18:03:24 2016
@@ -1,11 +1,11 @@
-#	$NetBSD: ALCHEMY,v 1.58 2016/12/08 11:31:10 nat Exp $
+#	$NetBSD: ALCHEMY,v 1.59 2016/12/10 23:03:24 christos Exp $
 #
 # Kernel config for the Alchemy Semiconductor (AMD) PB1000, PB1500,
 # DBAu1000 and DBAu1500 evaluation boards.
 
 include 	"arch/evbmips/conf/std.alchemy"
 
-#ident 		"ALCHEMY-$Revision: 1.58 $"
+#ident 		"ALCHEMY-$Revision: 1.59 $"
 
 maxusers	32
 
@@ -224,7 +224,6 @@ ugen*		at uhub? port ?
 auaudio*	at aubus? addr ?		# STAC9745 audio codec
 audio*		at auaudio?
 
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
 
 # GPIOs

Index: src/sys/arch/evbmips/conf/LOONGSON
diff -u src/sys/arch/evbmips/conf/LOONGSON:1.27 src/sys/arch/evbmips/conf/LOONGSON:1.28
--- src/sys/arch/evbmips/conf/LOONGSON:1.27	Thu Dec  8 06:31:10 2016
+++ src/sys/arch/evbmips/conf/LOONGSON	Sat Dec 10 18:03:24 2016
@@ -1,4 +1,4 @@
-# $NetBSD: LOONGSON,v 1.27 2016/12/08 11:31:10 nat Exp $
+# $NetBSD: LOONGSON,v 1.28 2016/12/10 23:03:24 christos Exp $
 #
 # LOONGSON machine description file
 # 
@@ -22,7 +22,7 @@ include		"arch/evbmips/conf/std.loongson
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"LOONGSON-$Revision: 1.27 $"
+#ident 		"LOONGSON-$Revision: 1.28 $"
 
 maxusers	16
 
@@ -209,7 +209,6 @@ com1		at isa? port 0x3f8 irq 4	# Fuloong
 gcscaudio*	at pci?
 audio*		at audiobus?
 
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
 
 pciide* 	at pci? dev ? function ? flags 0x0000	# GENERIC pciide driver

Index: src/sys/arch/evbmips/conf/MALTA
diff -u src/sys/arch/evbmips/conf/MALTA:1.83 src/sys/arch/evbmips/conf/MALTA:1.84
--- src/sys/arch/evbmips/conf/MALTA:1.83	Thu Dec  8 06:31:10 2016
+++ src/sys/arch/evbmips/conf/MALTA	Sat Dec 10 18:03:24 2016
@@ -1,10 +1,10 @@
-#	$NetBSD: MALTA,v 1.83 2016/12/08 11:31:10 nat Exp $
+#	$NetBSD: MALTA,v 1.84 2016/12/10 23:03:24 christos Exp $
 
 include 	"arch/evbmips/conf/std.malta"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"MALTA-$Revision: 1.83 $"
+#ident 		"MALTA-$Revision: 1.84 $"
 
 maxusers	32
 
@@ -296,7 +296,6 @@ clct*		at pci? dev ? function ?	# Cirrus
 # Audio support
 audio*		at clct?
 
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
 
 # Pseudo-devices

Index: src/sys/arch/evbppc/conf/EV64260
diff -u src/sys/arch/evbppc/conf/EV64260:1.65 src/sys/arch/evbppc/conf/EV64260:1.66
--- src/sys/arch/evbppc/conf/EV64260:1.65	Thu Dec  8 06:31:10 2016
+++ src/sys/arch/evbppc/conf/EV64260	Sat Dec 10 18:03:24 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: EV64260,v 1.65 2016/12/08 11:31:10 nat Exp $
+#	$NetBSD: EV64260,v 1.66 2016/12/10 23:03:24 christos Exp $
 #
 #	MVP -- Motorola's Multiprocessing Verification Platform
 #
@@ -237,7 +237,6 @@ cd*		at scsibus? target ? lun ?
 #auvia*	at pci? dev ? function ?	# VIA VT82C686A integrated AC'97 Audio
 #audio*	at auvia?
 
-#options VAUDIOSPEAKER
 #spkr0	at audio0		# PC speaker (synthesized)
 
 pciide* 	at pci? dev ? function ? flags 0x0000	# GENERIC pciide driver

Index: src/sys/arch/evbppc/conf/OPENBLOCKS266_OPT
diff -u src/sys/arch/evbppc/conf/OPENBLOCKS266_OPT:1.20 src/sys/arch/evbppc/conf/OPENBLOCKS266_OPT:1.21
--- src/sys/arch/evbppc/conf/OPENBLOCKS266_OPT:1.20	Thu Dec  8 06:31:10 2016
+++ src/sys/arch/evbppc/conf/OPENBLOCKS266_OPT	Sat Dec 10 18:03:24 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: OPENBLOCKS266_OPT,v 1.20 2016/12/08 11:31:10 nat Exp $
+#	$NetBSD: OPENBLOCKS266_OPT,v 1.21 2016/12/10 23:03:24 christos Exp $
 #
 
 include		"arch/evbppc/conf/OPENBLOCKS266"
@@ -193,7 +193,6 @@ wd*	at umass?
 uaudio* at uhub? port ? configuration ?
 audio* at uaudio?
 
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
 
 # USB MIDI

Index: src/sys/arch/evbppc/conf/PMPPC
diff -u src/sys/arch/evbppc/conf/PMPPC:1.37 src/sys/arch/evbppc/conf/PMPPC:1.38
--- src/sys/arch/evbppc/conf/PMPPC:1.37	Thu Dec  8 06:31:10 2016
+++ src/sys/arch/evbppc/conf/PMPPC	Sat Dec 10 18:03:24 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: PMPPC,v 1.37 2016/12/08 11:31:10 nat Exp $
+#	$NetBSD: PMPPC,v 1.38 2016/12/10 23:03:24 christos Exp $
 #
 #	PMPPC
 #
@@ -432,7 +432,6 @@ radio*	at radiodev?
 # Audio support
 audio*	at audiobus?
 
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
 
 pseudo-device	vnd			# disk-like interface to files

Index: src/sys/arch/hp300/conf/GENERIC
diff -u src/sys/arch/hp300/conf/GENERIC:1.192 src/sys/arch/hp300/conf/GENERIC:1.193
--- src/sys/arch/hp300/conf/GENERIC:1.192	Thu Dec  8 06:31:10 2016
+++ src/sys/arch/hp300/conf/GENERIC	Sat Dec 10 18:03:24 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.192 2016/12/08 11:31:10 nat Exp $
+# $NetBSD: GENERIC,v 1.193 2016/12/10 23:03:24 christos Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include 	"arch/hp300/conf/std.hp300"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.192 $"
+#ident 		"GENERIC-$Revision: 1.193 $"
 
 makeoptions	COPTS="-O2 -fno-reorder-blocks"	# see share/mk/sys.mk
 
@@ -285,7 +285,6 @@ uk*		at scsibus? target ? lun ?	# unknow
 arcofi* 	at dio? scode ?
 audio*		at arcofi?
 
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
 
 #

Index: src/sys/arch/hpcarm/conf/NETBOOKPRO
diff -u src/sys/arch/hpcarm/conf/NETBOOKPRO:1.18 src/sys/arch/hpcarm/conf/NETBOOKPRO:1.19
--- src/sys/arch/hpcarm/conf/NETBOOKPRO:1.18	Thu Dec  8 06:31:10 2016
+++ src/sys/arch/hpcarm/conf/NETBOOKPRO	Sat Dec 10 18:03:24 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: NETBOOKPRO,v 1.18 2016/12/08 11:31:10 nat Exp $
+#	$NetBSD: NETBOOKPRO,v 1.19 2016/12/10 23:03:24 christos Exp $
 #
 #	NETBOOKPRO -- Psion Teklogix NETBOOK PRO
 #
@@ -8,7 +8,7 @@ include	"arch/hpcarm/conf/files.netbookp
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.18 $"
+#ident 		"GENERIC-$Revision: 1.19 $"
 
 # estimated number of users
 maxusers	32
@@ -185,7 +185,6 @@ pxaacu0 at pxaip? addr 0x40500000 intr 1
 # Audio support
 audio*	at audiobus?
 
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
 
 # Inter-Integrated Circuit controller

Index: src/sys/arch/hpcarm/conf/WZERO3
diff -u src/sys/arch/hpcarm/conf/WZERO3:1.40 src/sys/arch/hpcarm/conf/WZERO3:1.41
--- src/sys/arch/hpcarm/conf/WZERO3:1.40	Thu Dec  8 06:31:10 2016
+++ src/sys/arch/hpcarm/conf/WZERO3	Sat Dec 10 18:03:24 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: WZERO3,v 1.40 2016/12/08 11:31:10 nat Exp $
+#	$NetBSD: WZERO3,v 1.41 2016/12/10 23:03:24 christos Exp $
 #
 #	WZERO3 -- Sharp Windows Mobile 5 based PDA
 #
@@ -8,7 +8,7 @@ include	"arch/hpcarm/conf/files.wzero3"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.40 $"
+#ident 		"GENERIC-$Revision: 1.41 $"
 
 # estimated number of users
 maxusers	32
@@ -237,7 +237,6 @@ wd* at umass?
 uaudio* at uhub? port ? configuration ?
 audio*	at audiobus?
 
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
 
 # USB Ethernet adapters

Index: src/sys/arch/hpcmips/conf/GENERIC
diff -u src/sys/arch/hpcmips/conf/GENERIC:1.231 src/sys/arch/hpcmips/conf/GENERIC:1.232
--- src/sys/arch/hpcmips/conf/GENERIC:1.231	Thu Dec  8 06:31:10 2016
+++ src/sys/arch/hpcmips/conf/GENERIC	Sat Dec 10 18:03:24 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.231 2016/12/08 11:31:10 nat Exp $
+# $NetBSD: GENERIC,v 1.232 2016/12/10 23:03:24 christos Exp $
 #
 # GENERIC machine description file
 # 
@@ -24,7 +24,7 @@ include		"arch/hpcmips/conf/std.hpcmips.
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.231 $"
+#ident 		"GENERIC-$Revision: 1.232 $"
 
 maxusers	16
 
@@ -655,7 +655,6 @@ ugen*	at uhub? port ?
 audio*	at uaudio?
 midi*	at midibus?
 
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
 
 # Pseudo-Devices

Index: src/sys/arch/hpcmips/conf/TX3922
diff -u src/sys/arch/hpcmips/conf/TX3922:1.103 src/sys/arch/hpcmips/conf/TX3922:1.104
--- src/sys/arch/hpcmips/conf/TX3922:1.103	Thu Dec  8 06:31:10 2016
+++ src/sys/arch/hpcmips/conf/TX3922	Sat Dec 10 18:03:24 2016
@@ -1,7 +1,7 @@
 #
 # Distribution kernel (TOSHIBA TX3922 based model) kernel config file
 #
-#	$NetBSD: TX3922,v 1.103 2016/12/08 11:31:10 nat Exp $
+#	$NetBSD: TX3922,v 1.104 2016/12/10 23:03:24 christos Exp $
 #
 include		"arch/hpcmips/conf/std.hpcmips"
 
@@ -225,7 +225,6 @@ scsibus* at umass? channel ?
 uaudio*	at uhub? port ? configuration ?
 audio*	at uaudio?
 
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
 
 # USB Ethernet adapters

Index: src/sys/arch/hpcmips/conf/VR41XX
diff -u src/sys/arch/hpcmips/conf/VR41XX:1.66 src/sys/arch/hpcmips/conf/VR41XX:1.67
--- src/sys/arch/hpcmips/conf/VR41XX:1.66	Thu Dec  8 06:31:10 2016
+++ src/sys/arch/hpcmips/conf/VR41XX	Sat Dec 10 18:03:24 2016
@@ -1,4 +1,4 @@
-# $NetBSD: VR41XX,v 1.66 2016/12/08 11:31:10 nat Exp $
+# $NetBSD: VR41XX,v 1.67 2016/12/10 23:03:24 christos Exp $
 #
 # GENERIC machine description file
 # 
@@ -20,7 +20,7 @@
 
 include		"arch/hpcmips/conf/std.hpcmips"
 include		"arch/hpcmips/conf/std.hpcmips.vr41"
-#ident 		"GENERIC-$Revision: 1.66 $"
+#ident 		"GENERIC-$Revision: 1.67 $"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
@@ -515,7 +515,6 @@ ugen*	at uhub? port ?
 
 audio*	at uaudio?
 
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
 
 pseudo-device	loop			# network loopback

Index: src/sys/arch/hppa/conf/GENERIC
diff -u src/sys/arch/hppa/conf/GENERIC:1.9 src/sys/arch/hppa/conf/GENERIC:1.10
--- src/sys/arch/hppa/conf/GENERIC:1.9	Thu Dec  8 06:31:10 2016
+++ src/sys/arch/hppa/conf/GENERIC	Sat Dec 10 18:03:24 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.9 2016/12/08 11:31:10 nat Exp $
+# $NetBSD: GENERIC,v 1.10 2016/12/10 23:03:24 christos Exp $
 #
 # GENERIC machine description file
 #
@@ -23,7 +23,7 @@ include 	"arch/hppa/conf/std.hppa"
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 options 	SYSCTL_INCLUDE_DESCR	# Include sysctl descriptions in kernel
 
-#ident 		"GENERIC-$Revision: 1.9 $"
+#ident 		"GENERIC-$Revision: 1.10 $"
 
 maxusers	32		# estimated number of users
 
@@ -548,7 +548,6 @@ harmony* at gsc?			# Audio Type 2 (CS421
 #com*	at harmony?			# Telephone add-in card
 audio*	at audiobus?
 
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
 
 # USB Controller and Devices

Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.405 src/sys/arch/i386/conf/ALL:1.406
--- src/sys/arch/i386/conf/ALL:1.405	Thu Dec  8 21:24:17 2016
+++ src/sys/arch/i386/conf/ALL	Sat Dec 10 18:03:24 2016
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.405 2016/12/09 02:24:17 christos Exp $
+# $NetBSD: ALL,v 1.406 2016/12/10 23:03:24 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.405 $"
+#ident 		"ALL-$Revision: 1.406 $"
 
 maxusers	64		# estimated number of users
 
@@ -1545,7 +1545,6 @@ midi*	at pcppi?		# MIDI interface to the
 # The spkr driver provides a simple tone interface to the built in speaker.
 spkr0	at pcppi?		# PC speaker
 
-#options VAUDIOSPEAKER
 #spkr0	at audio0		# PC speaker (synthesized)
 
 # FM-Radio devices

Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1143 src/sys/arch/i386/conf/GENERIC:1.1144
--- src/sys/arch/i386/conf/GENERIC:1.1143	Thu Dec  8 21:24:17 2016
+++ src/sys/arch/i386/conf/GENERIC	Sat Dec 10 18:03:24 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1143 2016/12/09 02:24:17 christos Exp $
+# $NetBSD: GENERIC,v 1.1144 2016/12/10 23:03:24 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.1143 $"
+#ident 		"GENERIC-$Revision: 1.1144 $"
 
 maxusers	64		# estimated number of users
 
@@ -1468,7 +1468,6 @@ midi*	at pcppi?		# MIDI interface to the
 # The spkr driver provides a simple tone interface to the built in speaker.
 #spkr0	at pcppi?		# PC speaker
 
-#options VAUDIOSPEAKER
 #spkr0	at audio0		# PC speaker (synthesized)
 
 

Index: src/sys/arch/i386/conf/GENERIC_TINY
diff -u src/sys/arch/i386/conf/GENERIC_TINY:1.144 src/sys/arch/i386/conf/GENERIC_TINY:1.145
--- src/sys/arch/i386/conf/GENERIC_TINY:1.144	Thu Dec  8 21:24:17 2016
+++ src/sys/arch/i386/conf/GENERIC_TINY	Sat Dec 10 18:03:24 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC_TINY,v 1.144 2016/12/09 02:24:17 christos Exp $
+#	$NetBSD: GENERIC_TINY,v 1.145 2016/12/10 23:03:24 christos Exp $
 #
 #	GENERIC_TINY -- suitable default for 4M machines
 #			No EISA, PCI, or SCSI.
@@ -510,7 +510,6 @@ we1	at isa? port 0x300 iomem 0xcc000 irq
 # The spkr driver provides a simple tone interface to the built in speaker.
 #spkr0	at pcppi?		# PC speaker
 
-#options VAUDIOSPEAKER
 #spkr0	at audio0		# PC speaker (synthesized)
 
 # Joysticks

Index: src/sys/arch/i386/conf/INSTALL_FLOPPY
diff -u src/sys/arch/i386/conf/INSTALL_FLOPPY:1.32 src/sys/arch/i386/conf/INSTALL_FLOPPY:1.33
--- src/sys/arch/i386/conf/INSTALL_FLOPPY:1.32	Thu Dec  8 21:24:17 2016
+++ src/sys/arch/i386/conf/INSTALL_FLOPPY	Sat Dec 10 18:03:24 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL_FLOPPY,v 1.32 2016/12/09 02:24:17 christos Exp $
+#	$NetBSD: INSTALL_FLOPPY,v 1.33 2016/12/10 23:03:24 christos Exp $
 #
 #	INSTALL - Installation kernel.
 #
@@ -712,7 +712,6 @@ url*	at uhub? port ?		# Realtek RTL8150L
 # The spkr driver provides a simple tone interface to the built in speaker.
 #spkr0	at pcppi?		# PC speaker
 
-#options VAUDIOSPEAKER
 #spkr0	at audio0		# PC speaker (synthesized)
 
 # Mice

Index: src/sys/arch/i386/conf/INSTALL_TINY
diff -u src/sys/arch/i386/conf/INSTALL_TINY:1.146 src/sys/arch/i386/conf/INSTALL_TINY:1.147
--- src/sys/arch/i386/conf/INSTALL_TINY:1.146	Thu Dec  8 21:24:17 2016
+++ src/sys/arch/i386/conf/INSTALL_TINY	Sat Dec 10 18:03:24 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL_TINY,v 1.146 2016/12/09 02:24:17 christos Exp $
+#	$NetBSD: INSTALL_TINY,v 1.147 2016/12/10 23:03:24 christos Exp $
 #
 #	This kernel should be derived from INSTALL (which is derived
 #	from GENERIC) with some features commented out.
@@ -470,7 +470,6 @@ we1	at isa? port 0x300 iomem 0xcc000 irq
 # The spkr driver provides a simple tone interface to the built in speaker.
 #spkr0	at pcppi?		# PC speaker
 
-#options VAUDIOSPEAKER
 #spkr0	at audio0		# PC speaker (synthesized)
 
 

Index: src/sys/arch/i386/conf/XEN3_DOM0
diff -u src/sys/arch/i386/conf/XEN3_DOM0:1.100 src/sys/arch/i386/conf/XEN3_DOM0:1.101
--- src/sys/arch/i386/conf/XEN3_DOM0:1.100	Thu Dec  8 06:31:11 2016
+++ src/sys/arch/i386/conf/XEN3_DOM0	Sat Dec 10 18:03:24 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: XEN3_DOM0,v 1.100 2016/12/08 11:31:11 nat Exp $
+#	$NetBSD: XEN3_DOM0,v 1.101 2016/12/10 23:03:24 christos Exp $
 #
 #	XEN3_0: Xen 3.0 domain0 kernel
 
@@ -719,7 +719,6 @@ hdafg*		at hdaudiobus?
 # Audio support
 audio*	at audiobus?
 
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
 
 # MPU 401 UARTs

Index: src/sys/arch/ibmnws/conf/GENERIC
diff -u src/sys/arch/ibmnws/conf/GENERIC:1.47 src/sys/arch/ibmnws/conf/GENERIC:1.48
--- src/sys/arch/ibmnws/conf/GENERIC:1.47	Thu Dec  8 06:31:11 2016
+++ src/sys/arch/ibmnws/conf/GENERIC	Sat Dec 10 18:03:24 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC,v 1.47 2016/12/08 11:31:11 nat Exp $
+#	$NetBSD: GENERIC,v 1.48 2016/12/10 23:03:24 christos Exp $
 #
 #
 
@@ -274,7 +274,6 @@ icsphy* at mii? phy ?                   
 paud0 at isa? port 0x830 irq 10 drq 0 drq2 1
 audio*	at audiobus?
 
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
 
 # Pseudo-Devices

Index: src/sys/arch/iyonix/conf/GENERIC
diff -u src/sys/arch/iyonix/conf/GENERIC:1.91 src/sys/arch/iyonix/conf/GENERIC:1.92
--- src/sys/arch/iyonix/conf/GENERIC:1.91	Thu Dec  8 06:31:11 2016
+++ src/sys/arch/iyonix/conf/GENERIC	Sat Dec 10 18:03:24 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC,v 1.91 2016/12/08 11:31:11 nat Exp $
+#	$NetBSD: GENERIC,v 1.92 2016/12/10 23:03:24 christos Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include	"arch/iyonix/conf/std.iyonix"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.91 $"
+#ident 		"GENERIC-$Revision: 1.92 $"
 
 maxusers	32		# estimated number of users
 
@@ -700,7 +700,6 @@ opl*	at yds?
 # Audio support
 audio*	at audiobus?
 
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
 
 # MPU 401 UARTs

Index: src/sys/arch/landisk/conf/GENERIC
diff -u src/sys/arch/landisk/conf/GENERIC:1.51 src/sys/arch/landisk/conf/GENERIC:1.52
--- src/sys/arch/landisk/conf/GENERIC:1.51	Thu Dec  8 06:31:11 2016
+++ src/sys/arch/landisk/conf/GENERIC	Sat Dec 10 18:03:24 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.51 2016/12/08 11:31:11 nat Exp $
+# $NetBSD: GENERIC,v 1.52 2016/12/10 23:03:24 christos Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include		"arch/landisk/conf/std.landisk"
 
 options         INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident          "GENERIC-$Revision: 1.51 $"
+#ident          "GENERIC-$Revision: 1.52 $"
 
 maxusers	16		# estimated number of users
 
@@ -395,7 +395,6 @@ ugen*	at uhub? port ?
 # Audio support
 audio*	at audiobus?
 
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
 
 # MIDI support

Index: src/sys/arch/macppc/conf/GENERIC
diff -u src/sys/arch/macppc/conf/GENERIC:1.324 src/sys/arch/macppc/conf/GENERIC:1.325
--- src/sys/arch/macppc/conf/GENERIC:1.324	Thu Dec  8 06:31:11 2016
+++ src/sys/arch/macppc/conf/GENERIC	Sat Dec 10 18:03:25 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.324 2016/12/08 11:31:11 nat Exp $
+# $NetBSD: GENERIC,v 1.325 2016/12/10 23:03:25 christos Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include		"arch/macppc/conf/std.macppc"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.324 $"
+#ident 		"GENERIC-$Revision: 1.325 $"
 
 maxusers	32
 
@@ -566,7 +566,6 @@ eap*	at pci? dev ? function ?	# Ensoniq 
 # Audio support
 audio*	at audiobus?
 
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
 
 # MPU 401 UARTs

Index: src/sys/arch/macppc/conf/GENERIC_601
diff -u src/sys/arch/macppc/conf/GENERIC_601:1.9 src/sys/arch/macppc/conf/GENERIC_601:1.10
--- src/sys/arch/macppc/conf/GENERIC_601:1.9	Thu Dec  8 06:31:11 2016
+++ src/sys/arch/macppc/conf/GENERIC_601	Sat Dec 10 18:03:25 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_601,v 1.9 2016/12/08 11:31:11 nat Exp $
+# $NetBSD: GENERIC_601,v 1.10 2016/12/10 23:03:25 christos Exp $
 #
 # GENERIC machine description file
 # 
@@ -28,7 +28,7 @@ include		"arch/macppc/conf/std.macppc.60
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-ident 		"GENERIC-$Revision: 1.9 $"
+ident 		"GENERIC-$Revision: 1.10 $"
 
 maxusers	32
 
@@ -312,7 +312,6 @@ ugen*	at uhub? port ? configuration ? in
 # Audio support
 audio*	at audiobus?
 
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
 
 #

Index: src/sys/arch/mmeye/conf/MMEYE_WLF
diff -u src/sys/arch/mmeye/conf/MMEYE_WLF:1.18 src/sys/arch/mmeye/conf/MMEYE_WLF:1.19
--- src/sys/arch/mmeye/conf/MMEYE_WLF:1.18	Thu Dec  8 06:31:11 2016
+++ src/sys/arch/mmeye/conf/MMEYE_WLF	Sat Dec 10 18:03:25 2016
@@ -1,4 +1,4 @@
-# $NetBSD: MMEYE_WLF,v 1.18 2016/12/08 11:31:11 nat Exp $
+# $NetBSD: MMEYE_WLF,v 1.19 2016/12/10 23:03:25 christos Exp $
 #
 # MMEYE_WLF -- Brains Inc. MMEYE-WLF platforms kernel
 #
@@ -22,7 +22,7 @@ include 	"arch/mmeye/conf/std.mmeye"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.18 $"
+#ident 		"GENERIC-$Revision: 1.19 $"
 
 maxusers	16		# estimated number of users
 
@@ -174,7 +174,6 @@ rs5c372rtc* at iic? addr 0x32
 #ac97x	at mainbus? addr1 0xb3000000-0xb300000f irq1 1	# AD1881A
 audio* at audiobus?
 
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
 
 # SH4 Area5/6 PCMCIA space devices

Index: src/sys/arch/netwinder/conf/GENERIC
diff -u src/sys/arch/netwinder/conf/GENERIC:1.128 src/sys/arch/netwinder/conf/GENERIC:1.129
--- src/sys/arch/netwinder/conf/GENERIC:1.128	Thu Dec  8 06:31:11 2016
+++ src/sys/arch/netwinder/conf/GENERIC	Sat Dec 10 18:03:25 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.128 2016/12/08 11:31:11 nat Exp $
+# $NetBSD: GENERIC,v 1.129 2016/12/10 23:03:25 christos Exp $
 #
 # GENERIC machine description file
 # 
@@ -274,7 +274,6 @@ midi*		at sb?					# SB1 MIDI port
 # Audio support
 audio*		at sb?
 
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
 
 # Pseudo-Devices

Index: src/sys/arch/ofppc/conf/GENERIC
diff -u src/sys/arch/ofppc/conf/GENERIC:1.159 src/sys/arch/ofppc/conf/GENERIC:1.160
--- src/sys/arch/ofppc/conf/GENERIC:1.159	Thu Dec  8 06:31:11 2016
+++ src/sys/arch/ofppc/conf/GENERIC	Sat Dec 10 18:03:25 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.159 2016/12/08 11:31:11 nat Exp $
+# $NetBSD: GENERIC,v 1.160 2016/12/10 23:03:25 christos Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include 	"arch/ofppc/conf/std.ofppc"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.159 $"
+#ident 		"GENERIC-$Revision: 1.160 $"
 
 maxusers	32
 
@@ -405,7 +405,6 @@ auvia*  at pci? dev ? function ?	# VIA V
 # Audio support
 audio*	at audiobus?
 
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
 
 

Index: src/sys/arch/playstation2/conf/DEBUG
diff -u src/sys/arch/playstation2/conf/DEBUG:1.21 src/sys/arch/playstation2/conf/DEBUG:1.22
--- src/sys/arch/playstation2/conf/DEBUG:1.21	Thu Dec  8 06:31:11 2016
+++ src/sys/arch/playstation2/conf/DEBUG	Sat Dec 10 18:03:25 2016
@@ -1,7 +1,7 @@
 #
 # kernel config file for debugging.
 #
-# 	$NetBSD: DEBUG,v 1.21 2016/12/08 11:31:11 nat Exp $
+# 	$NetBSD: DEBUG,v 1.22 2016/12/10 23:03:25 christos Exp $
 #
 
 include 	"arch/playstation2/conf/std.playstation2"
@@ -112,9 +112,6 @@ uyap* at uhub? port ?
 
 audio*	at uaudio?
 
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
 
 pseudo-device	ppp			# Point-to-Point Protocol
-
-

Index: src/sys/arch/pmax/conf/GENERIC
diff -u src/sys/arch/pmax/conf/GENERIC:1.188 src/sys/arch/pmax/conf/GENERIC:1.189
--- src/sys/arch/pmax/conf/GENERIC:1.188	Thu Dec  8 06:31:11 2016
+++ src/sys/arch/pmax/conf/GENERIC	Sat Dec 10 18:03:25 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.188 2016/12/08 11:31:11 nat Exp $
+# $NetBSD: GENERIC,v 1.189 2016/12/10 23:03:25 christos Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include		"arch/pmax/conf/std.pmax"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC-$Revision: 1.188 $"
+#ident		"GENERIC-$Revision: 1.189 $"
 
 maxusers	64
 
@@ -205,7 +205,6 @@ vsms*	at	zsc0 channel ?		# mouse port on
 
 audio*	at	bba?
 
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
 
 dtkbd*	at	dt? addr ?

Index: src/sys/arch/pmax/conf/GENERIC64
diff -u src/sys/arch/pmax/conf/GENERIC64:1.22 src/sys/arch/pmax/conf/GENERIC64:1.23
--- src/sys/arch/pmax/conf/GENERIC64:1.22	Thu Dec  8 06:31:11 2016
+++ src/sys/arch/pmax/conf/GENERIC64	Sat Dec 10 18:03:25 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC64,v 1.22 2016/12/08 11:31:11 nat Exp $
+# $NetBSD: GENERIC64,v 1.23 2016/12/10 23:03:25 christos Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include		"arch/pmax/conf/std.pmax64"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC-$Revision: 1.22 $"
+#ident		"GENERIC-$Revision: 1.23 $"
 
 maxusers	64
 
@@ -204,7 +204,6 @@ vsms*	at	zsc0 channel ?		# mouse port on
 
 audio*	at	bba?
 
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
 
 dtkbd*	at	dt? addr ?

Index: src/sys/arch/pmax/conf/INSTALL
diff -u src/sys/arch/pmax/conf/INSTALL:1.72 src/sys/arch/pmax/conf/INSTALL:1.73
--- src/sys/arch/pmax/conf/INSTALL:1.72	Thu Dec  8 06:31:11 2016
+++ src/sys/arch/pmax/conf/INSTALL	Sat Dec 10 18:03:25 2016
@@ -1,4 +1,4 @@
-# 	$NetBSD: INSTALL,v 1.72 2016/12/08 11:31:11 nat Exp $
+# 	$NetBSD: INSTALL,v 1.73 2016/12/10 23:03:25 christos Exp $
 #
 # Distribution	install kernel (any model)
 #    netbsd:	cut-down kernel for miniroots.
@@ -113,7 +113,6 @@ lkkbd*	at	zsc1 channel ?		# keyboard por
 
 #audio*	at	bba?
 
-#options VAUDIOSPEAKER
 #spkr0	at audio0		# PC speaker (synthesized)
 
 dtkbd*	at	dt? addr ?

Index: src/sys/arch/pmax/conf/INSTALL64
diff -u src/sys/arch/pmax/conf/INSTALL64:1.9 src/sys/arch/pmax/conf/INSTALL64:1.10
--- src/sys/arch/pmax/conf/INSTALL64:1.9	Thu Dec  8 06:31:11 2016
+++ src/sys/arch/pmax/conf/INSTALL64	Sat Dec 10 18:03:25 2016
@@ -1,4 +1,4 @@
-# 	$NetBSD: INSTALL64,v 1.9 2016/12/08 11:31:11 nat Exp $
+# 	$NetBSD: INSTALL64,v 1.10 2016/12/10 23:03:25 christos Exp $
 #
 # Distribution	install kernel (any model)
 #    netbsd:	cut-down kernel for miniroots.
@@ -106,7 +106,6 @@ lkkbd*	at	zsc1 channel ?		# keyboard por
 
 #audio*	at	bba?
 
-#options VAUDIOSPEAKER
 #spkr0	at audio0		# PC speaker (synthesized)
 
 dtkbd*	at	dt? addr ?

Index: src/sys/arch/prep/conf/GENERIC
diff -u src/sys/arch/prep/conf/GENERIC:1.178 src/sys/arch/prep/conf/GENERIC:1.179
--- src/sys/arch/prep/conf/GENERIC:1.178	Thu Dec  8 21:25:47 2016
+++ src/sys/arch/prep/conf/GENERIC	Sat Dec 10 18:03:25 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.178 2016/12/09 02:25:47 christos Exp $
+# $NetBSD: GENERIC,v 1.179 2016/12/10 23:03:25 christos Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include 	"arch/prep/conf/std.prep"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC-$Revision: 1.178 $"
+#ident		"GENERIC-$Revision: 1.179 $"
 
 maxusers	32
 
@@ -508,7 +508,6 @@ ukphy*	at mii? phy ?			# generic unknown
 # The spkr driver provides a simple tone interface to the built in speaker.
 #spkr0	at pcppi?		# PC speaker
 
-#options VAUDIOSPEAKER
 #spkr0	at audio0		# PC speaker (synthesized)
 
 

Index: src/sys/arch/sandpoint/conf/ENCPP1
diff -u src/sys/arch/sandpoint/conf/ENCPP1:1.13 src/sys/arch/sandpoint/conf/ENCPP1:1.14
--- src/sys/arch/sandpoint/conf/ENCPP1:1.13	Thu Dec  8 06:31:12 2016
+++ src/sys/arch/sandpoint/conf/ENCPP1	Sat Dec 10 18:03:25 2016
@@ -1,4 +1,4 @@
-# $NetBSD: ENCPP1,v 1.13 2016/12/08 11:31:12 nat Exp $
+# $NetBSD: ENCPP1,v 1.14 2016/12/10 23:03:25 christos Exp $
 #
 # Ampro EnCorePP1 machine description file
 # 
@@ -23,7 +23,7 @@ options 	PIC_I8259
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"ENCPP1-$Revision: 1.13 $"
+#ident 		"ENCPP1-$Revision: 1.14 $"
 
 maxusers	32
 
@@ -176,7 +176,6 @@ auvia*	at pci? dev ? function ?	# VIA in
 # Audio support
 audio*	at audiobus?
 
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
 
 pckbc0		at isa?			# PS/2 keyboard controller

Index: src/sys/arch/sgimips/conf/GENERIC32_IP2x
diff -u src/sys/arch/sgimips/conf/GENERIC32_IP2x:1.106 src/sys/arch/sgimips/conf/GENERIC32_IP2x:1.107
--- src/sys/arch/sgimips/conf/GENERIC32_IP2x:1.106	Thu Dec  8 06:31:12 2016
+++ src/sys/arch/sgimips/conf/GENERIC32_IP2x	Sat Dec 10 18:03:25 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC32_IP2x,v 1.106 2016/12/08 11:31:12 nat Exp $
+#	$NetBSD: GENERIC32_IP2x,v 1.107 2016/12/10 23:03:25 christos Exp $
 #
 # GENERIC32_IP2x machine description file
 # 
@@ -29,7 +29,7 @@ makeoptions	TEXTADDR=0x88069000	# entry 
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC32-IP2x-$Revision: 1.106 $"
+#ident		"GENERIC32-IP2x-$Revision: 1.107 $"
 
 maxusers	32
 
@@ -280,7 +280,6 @@ zsms0		at zsc1 channel 1
 scsibus*	at scsi?		# HPC SCSI
 audio*  	at audiobus?
 
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
 
 # Pseudo-Devices

Index: src/sys/arch/sgimips/conf/GENERIC32_IP3x
diff -u src/sys/arch/sgimips/conf/GENERIC32_IP3x:1.109 src/sys/arch/sgimips/conf/GENERIC32_IP3x:1.110
--- src/sys/arch/sgimips/conf/GENERIC32_IP3x:1.109	Thu Dec  8 06:31:12 2016
+++ src/sys/arch/sgimips/conf/GENERIC32_IP3x	Sat Dec 10 18:03:25 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC32_IP3x,v 1.109 2016/12/08 11:31:12 nat Exp $
+#	$NetBSD: GENERIC32_IP3x,v 1.110 2016/12/10 23:03:25 christos Exp $
 #
 # GENERIC32_IP3x machine description file
 # 
@@ -28,7 +28,7 @@ makeoptions	TEXTADDR="0x80069000"	# entr
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC32_IP3x-$Revision: 1.109 $"
+#ident		"GENERIC32_IP3x-$Revision: 1.110 $"
 
 maxusers	32
 
@@ -415,7 +415,6 @@ sbp*	at ieee1394if? euihi ? euilo ?
 # Audio support
 audio*  at audiobus?
 
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
 
 # MIDI support

Index: src/sys/arch/shark/conf/GENERIC
diff -u src/sys/arch/shark/conf/GENERIC:1.124 src/sys/arch/shark/conf/GENERIC:1.125
--- src/sys/arch/shark/conf/GENERIC:1.124	Thu Dec  8 06:31:12 2016
+++ src/sys/arch/shark/conf/GENERIC	Sat Dec 10 18:03:25 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC,v 1.124 2016/12/08 11:31:12 nat Exp $
+#	$NetBSD: GENERIC,v 1.125 2016/12/10 23:03:25 christos Exp $
 #
 # Generic Shark configuration.
 #
@@ -7,7 +7,7 @@ include	"arch/shark/conf/std.shark"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC-$Revision: 1.124 $"
+#ident		"GENERIC-$Revision: 1.125 $"
 
 # estimated number of users
 maxusers	32
@@ -271,7 +271,6 @@ audio*		at ess?
 opl*		at ess?
 midi*		at opl?
 
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
 
 # Joystick @OFW

Index: src/sys/arch/shark/conf/INSTALL
diff -u src/sys/arch/shark/conf/INSTALL:1.59 src/sys/arch/shark/conf/INSTALL:1.60
--- src/sys/arch/shark/conf/INSTALL:1.59	Thu Dec  8 06:31:12 2016
+++ src/sys/arch/shark/conf/INSTALL	Sat Dec 10 18:03:25 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL,v 1.59 2016/12/08 11:31:12 nat Exp $
+#	$NetBSD: INSTALL,v 1.60 2016/12/10 23:03:25 christos Exp $
 #
 #	Shark installation kernel
 #
@@ -235,7 +235,6 @@ scr*		at ofisascr?
 #opl*		at ess?
 #midi*		at opl?
 
-#options VAUDIOSPEAKER
 #spkr0	at audio0		# PC speaker (synthesized)
 
 # Joystick @OFW

Index: src/sys/arch/sparc/conf/INSTALL
diff -u src/sys/arch/sparc/conf/INSTALL:1.93 src/sys/arch/sparc/conf/INSTALL:1.94
--- src/sys/arch/sparc/conf/INSTALL:1.93	Thu Dec  8 06:31:12 2016
+++ src/sys/arch/sparc/conf/INSTALL	Sat Dec 10 18:03:25 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL,v 1.93 2016/12/08 11:31:12 nat Exp $
+#	$NetBSD: INSTALL,v 1.94 2016/12/10 23:03:25 christos Exp $
 #
 # from: NetBSD: GENERIC,v 1.84 1999/06/06 13:00:03 mrg Exp
 #
@@ -508,7 +508,6 @@ pseudo-device	loop
 #audiocs0	at sbus0 slot ? offset ?		# SUNW,CS4231
 #audio*		at audiocs0
 
-#options VAUDIOSPEAKER
 #spkr0	at audio0		# PC speaker (synthesized)
 
 

Index: src/sys/arch/sparc/conf/KRUPS
diff -u src/sys/arch/sparc/conf/KRUPS:1.70 src/sys/arch/sparc/conf/KRUPS:1.71
--- src/sys/arch/sparc/conf/KRUPS:1.70	Thu Dec  8 06:31:12 2016
+++ src/sys/arch/sparc/conf/KRUPS	Sat Dec 10 18:03:25 2016
@@ -1,4 +1,4 @@
-# $NetBSD: KRUPS,v 1.70 2016/12/08 11:31:12 nat Exp $
+# $NetBSD: KRUPS,v 1.71 2016/12/10 23:03:25 christos Exp $
 # From: NetBSD: GENERIC,v 1.197 2006/12/04 23:43:35 elad Exp
 #
 # Krups (JavaStation-NC) machine description file
@@ -8,7 +8,7 @@ include 	"arch/sparc/conf/std.sparc"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"KRUPS-$Revision: 1.70 $"
+#ident 		"KRUPS-$Revision: 1.71 $"
 
 maxusers	32
 
@@ -323,7 +323,6 @@ pseudo-device	bpfilter
 audiocs*	at ebus?		# SUNW,CS4231
 audio*		at audiocs?
 
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
 
 # wscons

Index: src/sys/arch/sparc/conf/MRCOFFEE
diff -u src/sys/arch/sparc/conf/MRCOFFEE:1.49 src/sys/arch/sparc/conf/MRCOFFEE:1.50
--- src/sys/arch/sparc/conf/MRCOFFEE:1.49	Thu Dec  8 06:31:12 2016
+++ src/sys/arch/sparc/conf/MRCOFFEE	Sat Dec 10 18:03:25 2016
@@ -1,4 +1,4 @@
-# $NetBSD: MRCOFFEE,v 1.49 2016/12/08 11:31:12 nat Exp $
+# $NetBSD: MRCOFFEE,v 1.50 2016/12/10 23:03:25 christos Exp $
 # From: NetBSD: GENERIC,v 1.197 2006/12/04 23:43:35 elad Exp
 #
 # Mr.Coffee (JavaStation 1) machine description file
@@ -12,7 +12,7 @@ include 	"arch/sparc/conf/std.sparc"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"MRCOFFEE-$Revision: 1.49 $"
+#ident 		"MRCOFFEE-$Revision: 1.50 $"
 
 maxusers	32
 
@@ -315,7 +315,6 @@ pseudo-device	bpfilter
 audiocs0	at sbus0 slot ? offset ?		# SUNW,CS4231
 audio0		at audiocs0
 
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
 
 ## Sun "tcx" accelerated color framebuffer.

Index: src/sys/arch/sparc/conf/TADPOLE3GX
diff -u src/sys/arch/sparc/conf/TADPOLE3GX:1.68 src/sys/arch/sparc/conf/TADPOLE3GX:1.69
--- src/sys/arch/sparc/conf/TADPOLE3GX:1.68	Thu Dec  8 06:31:12 2016
+++ src/sys/arch/sparc/conf/TADPOLE3GX	Sat Dec 10 18:03:25 2016
@@ -1,4 +1,4 @@
-# 	$NetBSD: TADPOLE3GX,v 1.68 2016/12/08 11:31:12 nat Exp $
+# 	$NetBSD: TADPOLE3GX,v 1.69 2016/12/10 23:03:25 christos Exp $
 
 include "arch/sparc/conf/std.sparc"
 
@@ -345,7 +345,6 @@ options 	DBRI_BIG_BUFFER	# use bigger DM
 dbri0		at sbus0 slot ? offset ?		# SUNW,DBRI[s3|e]
 audio*		at audiobus?
 
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
 
 # Tadpole 3GX/3GS (P9100 -- P Nine One Zero Zero -> pnozz)

Index: src/sys/arch/sparc64/conf/GENERIC
diff -u src/sys/arch/sparc64/conf/GENERIC:1.194 src/sys/arch/sparc64/conf/GENERIC:1.195
--- src/sys/arch/sparc64/conf/GENERIC:1.194	Thu Dec  8 06:31:12 2016
+++ src/sys/arch/sparc64/conf/GENERIC	Sat Dec 10 18:03:25 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.194 2016/12/08 11:31:12 nat Exp $
+# $NetBSD: GENERIC,v 1.195 2016/12/10 23:03:25 christos Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include 	"arch/sparc64/conf/std.sparc64"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC-$Revision: 1.194 $"
+#ident		"GENERIC-$Revision: 1.195 $"
 
 maxusers	64
 
@@ -883,7 +883,6 @@ auacer* 	at pci? dev ? function ?	# Ultr
 
 audio*		at audiobus?
 
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
 
 midi*		at midibus?

Index: src/sys/arch/sparc64/conf/NONPLUS64
diff -u src/sys/arch/sparc64/conf/NONPLUS64:1.48 src/sys/arch/sparc64/conf/NONPLUS64:1.49
--- src/sys/arch/sparc64/conf/NONPLUS64:1.48	Thu Dec  8 06:31:12 2016
+++ src/sys/arch/sparc64/conf/NONPLUS64	Sat Dec 10 18:03:25 2016
@@ -1,8 +1,8 @@
-#	$NetBSD: NONPLUS64,v 1.48 2016/12/08 11:31:12 nat Exp $
+#	$NetBSD: NONPLUS64,v 1.49 2016/12/10 23:03:25 christos Exp $
 
 include 	"arch/sparc64/conf/std.sparc64"
 
-#ident		"NONPLUS64-$Revision: 1.48 $"
+#ident		"NONPLUS64-$Revision: 1.49 $"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
@@ -365,7 +365,6 @@ pseudo-device	ipfilter
 audiocs0	at sbus0 slot ? offset ?		# SUNW,CS4231
 audio*		at audiocs0
 
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
 
 

Index: src/sys/arch/usermode/conf/GENERIC.common
diff -u src/sys/arch/usermode/conf/GENERIC.common:1.22 src/sys/arch/usermode/conf/GENERIC.common:1.23
--- src/sys/arch/usermode/conf/GENERIC.common:1.22	Thu Dec  8 06:31:12 2016
+++ src/sys/arch/usermode/conf/GENERIC.common	Sat Dec 10 18:03:26 2016
@@ -1,9 +1,9 @@
-# $NetBSD: GENERIC.common,v 1.22 2016/12/08 11:31:12 nat Exp $
+# $NetBSD: GENERIC.common,v 1.23 2016/12/10 23:03:26 christos Exp $
 
 include "arch/usermode/conf/std.usermode"
 
 options 	INCLUDE_CONFIG_FILE
-#ident 		"GENERIC-$Revision: 1.22 $"
+#ident 		"GENERIC-$Revision: 1.23 $"
 maxusers 	32
 
 makeoptions	DEBUG="-O1 -g3"
@@ -65,7 +65,6 @@ veth0		at mainbus?
 vaudio0		at mainbus?
 audio0		at vaudio0
 
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
 
 vncfb0		at mainbus?

Index: src/sys/arch/vax/conf/GENERIC
diff -u src/sys/arch/vax/conf/GENERIC:1.197 src/sys/arch/vax/conf/GENERIC:1.198
--- src/sys/arch/vax/conf/GENERIC:1.197	Thu Dec  8 06:31:12 2016
+++ src/sys/arch/vax/conf/GENERIC	Sat Dec 10 18:03:26 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.197 2016/12/08 11:31:12 nat Exp $
+# $NetBSD: GENERIC,v 1.198 2016/12/10 23:03:26 christos Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include		"arch/vax/conf/std.vax"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.197 $"
+#ident 		"GENERIC-$Revision: 1.198 $"
 
 # Here are all different supported CPU types listed.
 #options 	VAX8800		# VAX 8500, 8530, 8550, 8700, 8800
@@ -209,7 +209,6 @@ vsaudio0	at vsbus0 csr 0x200d0000 # VS40
 vsaudio0	at vsbus0 csr 0x26800000 # VS4000/90 audio
 audio*		at audiobus?
 
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
 
 tc0		at vsbus0 csr 0x36000000 # VS4000/60 or 90 TC adapter

Index: src/sys/arch/x68k/conf/GENERIC
diff -u src/sys/arch/x68k/conf/GENERIC:1.181 src/sys/arch/x68k/conf/GENERIC:1.182
--- src/sys/arch/x68k/conf/GENERIC:1.181	Thu Dec  8 06:31:12 2016
+++ src/sys/arch/x68k/conf/GENERIC	Sat Dec 10 18:03:26 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.181 2016/12/08 11:31:12 nat Exp $
+# $NetBSD: GENERIC,v 1.182 2016/12/10 23:03:26 christos Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include 	"arch/x68k/conf/std.x68k"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.181 $"
+#ident 		"GENERIC-$Revision: 1.182 $"
 
 makeoptions	COPTS="-O2 -fno-reorder-blocks"	# see share/mk/sys.mk
 
@@ -293,7 +293,6 @@ com1	at intio0 addr 0xefff10 intr 241	# 
 vs0 at intio0 addr 0xe92000 dma 3 dmaintr 106
 audio*	at vs?
 
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
 
 ## Network interfaces

Index: src/sys/arch/x68k/conf/INSTALL
diff -u src/sys/arch/x68k/conf/INSTALL:1.110 src/sys/arch/x68k/conf/INSTALL:1.111
--- src/sys/arch/x68k/conf/INSTALL:1.110	Thu Dec  8 06:31:12 2016
+++ src/sys/arch/x68k/conf/INSTALL	Sat Dec 10 18:03:26 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL,v 1.110 2016/12/08 11:31:12 nat Exp $
+#	$NetBSD: INSTALL,v 1.111 2016/12/10 23:03:26 christos Exp $
 
 #
 #	INSTALL -- installation kernel.
@@ -8,7 +8,7 @@ include "arch/x68k/conf/std.x68k"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"INSTALL-$Revision: 1.110 $"
+#ident 		"INSTALL-$Revision: 1.111 $"
 
 makeoptions	COPTS="-Os"		# Optimise for space. Implies -O2
 
@@ -255,7 +255,6 @@ sram0	at intio0 addr 0xed0000		# battery
 #vs0 at intio0 addr 0xe92000 dma 3 dmaintr 106
 #audio*	at vs?
 
-#options VAUDIOSPEAKER
 #spkr0	at audio0		# PC speaker (synthesized)
 
 ## Network interfaces

Index: src/sys/arch/zaurus/conf/GENERIC
diff -u src/sys/arch/zaurus/conf/GENERIC:1.68 src/sys/arch/zaurus/conf/GENERIC:1.69
--- src/sys/arch/zaurus/conf/GENERIC:1.68	Thu Dec  8 06:31:13 2016
+++ src/sys/arch/zaurus/conf/GENERIC	Sat Dec 10 18:03:26 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC,v 1.68 2016/12/08 11:31:13 nat Exp $
+#	$NetBSD: GENERIC,v 1.69 2016/12/10 23:03:26 christos Exp $
 #
 # GENERIC machine description file
 #
@@ -135,6 +135,7 @@ options 	SYSVSHM		# System V-like memory
 #options 	USERCONF	# userconf(4) support
 #options 	PIPE_SOCKETPAIR # smaller, but slower pipe(2)
 #options 	SYSCTL_INCLUDE_DESCR	# Include sysctl descriptions in kernel
+options		NOPORTALGO
 
 #
 # wscons options
@@ -240,7 +241,6 @@ audio* at zaudio?
 # Audio support
 audio* at audiobus?
 
-options VAUDIOSPEAKER
 spkr0	at audio0		# PC speaker (synthesized)
 
 # integrated 16550 UARTs

Reply via email to