Move speaker(4) to MI land.

3 files changed, 11 insertions, 11 deletions

diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index c6034ce002a..2434aa4ebcf 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.296 2005/05/10 03:04:25 brad Exp $
+#	$OpenBSD: Makefile,v 1.297 2005/05/13 22:46:51 miod Exp $
 
 MAN=	aac.4 ac97.4 acphy.4 addcom.4 adv.4 aha.4 ahb.4 ahc.4 ahd.4 \
 	aic.4 amdpm.4 ami.4 amphy.4 an.4 aria.4 ast.4 atalk.4 \
@@ -25,7 +25,7 @@ MAN=	aac.4 ac97.4 acphy.4 addcom.4 adv.4 aha.4 ahb.4 ahc.4 ahd.4 \
 	pms.4 ppb.4 ppp.4 pppoe.4 pty.4 puc.4 qsphy.4 radio.4 raid.4 ral.4 \
 	random.4 ray.4 rd.4 re.4 rgephy.4 rl.4 rln.4 rlphy.4 route.4 rt.4 \
 	rtfps.4 rtii.4 rtw.4 safe.4 san.4 sbus.4 scsi.4 sd.4 ses.4 sf.4 \
-	sf2r.4 sfr.4 siop.4 sis.4 sk.4 sl.4 sm.4 spp.4 sppp.4 \
+	sf2r.4 sfr.4 siop.4 sis.4 sk.4 sl.4 sm.4 speaker.4 spp.4 sppp.4 \
 	sqphy.4 ss.4 st.4 ste.4 stge.4 sti.4 stp.4 sv.4 \
 	systrace.4 tb.4 tcic.4 tcp.4 termios.4 ti.4 tl.4 \
 	tlphy.4 tqphy.4 trm.4 tty.4 tun.4 twe.4 txp.4 \
@@ -57,6 +57,7 @@ MLINKS+=random.4 arandom.4
 MLINKS+=random.4 srandom.4 random.4 urandom.4 random.4 prandom.4
 MLINKS+=scsi.4 scsibus.4
 MLINKS+=sk.4 skc.4
+MLINKS+=speaker.4 spkr.4
 MLINKS+=tty.4 cua.4
 MLINKS+=usb.4 uhub.4
 MLINKS+=vnd.4 svnd.4
diff --git a/share/man/man4/man4.i386/Makefile b/share/man/man4/man4.i386/Makefile
index 128e6ff507f..bafb557dd8b 100644
--- a/share/man/man4/man4.i386/Makefile
+++ b/share/man/man4/man4.i386/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.53 2005/04/05 00:11:19 brad Exp $
+#	$OpenBSD: Makefile,v 1.54 2005/05/13 22:47:04 miod Exp $
 #	from: @(#)Makefile	5.1 (Berkeley) 2/12/91
 #	Id: Makefile,v 1.4 1995/12/14 05:41:38 deraadt Exp $
 
@@ -7,9 +7,8 @@ MAN=	apm.4 autoconf.4 bios.4 cpu.4 elansc.4 \
 	ichpcib.4 intro.4 \
 	joy.4 le.4 lms.4 mcd.4 mem.4 mms.4 mtrr.4 npx.4 nvram.4 pcibios.4 \
 	pctr.4 pss.4 sb.4 \
-	sea.4 speaker.4 uha.4 wdt.4 wss.4 wt.4
+	sea.4 uha.4 wdt.4 wss.4 wt.4
 
-MLINKS+= speaker.4 spkr.4
 MLINKS+= mem.4 kmem.4
 MANSUBDIR=i386
 
diff --git a/share/man/man4/man4.i386/speaker.4 b/share/man/man4/speaker.4
index af303dc35a6..873d8e73cb4 100644
--- a/share/man/man4/man4.i386/speaker.4
+++ b/share/man/man4/speaker.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: speaker.4,v 1.15 2003/11/09 16:06:07 jmc Exp $
+.\"	$OpenBSD: speaker.4,v 1.1 2005/05/13 22:46:51 miod Exp $
 .\"	$NetBSD: speaker.4,v 1.9 1998/08/18 08:16:56 augustss Exp $
 .\"
 .\" Copyright (c) 1993 Christopher G. Demetriou
@@ -29,8 +29,8 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd August 6, 1993
-.Dt SPEAKER 4 i386
+.Dd May 13, 20005
+.Dt SPEAKER 4
 .Os
 .Sh NAME
 .Nm speaker
@@ -40,8 +40,8 @@
 .Sh DESCRIPTION
 The
 .Nm
-device driver allows applications to control the PC console
-speaker on an IBM-PC-compatible machine running UNIX.
+device driver allows applications to control the built-in speaker on
+machines providing a PCPPI speaker interface.
 .Pp
 Only one process may have this device open at any given time;
 .Xr open 2
@@ -72,7 +72,7 @@ on a speaker file descriptor to control the speaker driver directly;
 definitions for the
 .Fn ioctl
 interface are in
-.Aq Pa machine/spkr.h .
+.Aq Pa dev/isa/spkrio.h .
 The
 .Li tone_t
 structure used in these calls has two fields,