3 files changed, 4 insertions, 82 deletions
diff --git a/share/man/man4/isa.4 b/share/man/man4/isa.4
index 03e2e951d5d..5f1ce6130b3 100644
--- a/share/man/man4/isa.4
+++ b/share/man/man4/isa.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: isa.4,v 1.68 2011/06/26 23:23:55 tedu Exp $
+.\"	$OpenBSD: isa.4,v 1.69 2011/06/29 17:49:39 tedu Exp $
 .\"	$NetBSD: isa.4,v 1.19 2000/03/18 16:54:37 augustss Exp $
 .\"
 .\" Copyright (c) 2000 Theo de Raadt.  All rights reserved.
@@ -31,7 +31,7 @@
 .\" (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 $Mdocdate: June 26 2011 $
+.Dd $Mdocdate: June 29 2011 $
 .Dt ISA 4
 .Os
 .Sh NAME
@@ -165,8 +165,6 @@ Gravis UltraSound/UltraSound MAX audio device
 Roland/Yamaha MPU401 MIDI UART device
 .It Xr pas 4
 Media Vision Pro AudioSpectrum audio device
-.It Xr pss 4
-Personal Sound System audio device
 .It Xr sb 4
 SoundBlaster family audio device
 .It Xr wss 4
diff --git a/share/man/man4/man4.i386/Makefile b/share/man/man4/man4.i386/Makefile
index cd20452358b..b20ae9adfe3 100644
--- a/share/man/man4/man4.i386/Makefile
+++ b/share/man/man4/man4.i386/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.70 2011/06/26 23:23:55 tedu Exp $
+#	$OpenBSD: Makefile,v 1.71 2011/06/29 17:49:39 tedu Exp $
 #	from: @(#)Makefile	5.1 (Berkeley) 2/12/91
 #	Id: Makefile,v 1.4 1995/12/14 05:41:38 deraadt Exp $
 
@@ -6,7 +6,7 @@ MAN=	amdpcib.4 amdmsr.4 apm.4 autoconf.4 bios.4 cpu.4 elansc.4 \
 	esm.4 geodesc.4 glxpcib.4 glxsb.4 gscpcib.4 gscpm.4 gus.4 ie.4 \
 	ichpcib.4 intro.4 ioapic.4 \
 	joy.4 le.4 lms.4 mem.4 mms.4 mpbios.4 mtrr.4 npx.4 nvram.4 \
-	pas.4 pcibios.4 pctr.4 piixpcib.4 pss.4 sb.4 \
+	pas.4 pcibios.4 pctr.4 piixpcib.4 sb.4 \
 	sea.4 uha.4 wds.4 wdt.4 wss.4
 
 MLINKS+= mem.4 kmem.4
diff --git a/share/man/man4/man4.i386/pss.4 b/share/man/man4/man4.i386/pss.4
deleted file mode 100644
index 1a150bf74be..00000000000
--- a/share/man/man4/man4.i386/pss.4
+++ /dev/null
@@ -1,76 +0,0 @@
-.\"   $OpenBSD: pss.4,v 1.10 2007/05/31 19:19:55 jmc Exp $
-.\"   $NetBSD: pss.4,v 1.3 1997/10/05 21:42:20 augustss Exp $
-.\"
-.\" Copyright (c) 1995 Michael Long.
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. The name of the author may not be used to endorse or promote products
-.\"    derived from this software without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-.\" (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 $Mdocdate: May 31 2007 $
-.Dt PSS 4 i386
-.Os
-.Sh NAME
-.Nm pss
-.Nd Personal Sound System audio device
-.Sh SYNOPSIS
-.Cd "pss0 at isa? port 0x220 irq 7 drq 6"
-.Cd "sp0 at pss0 port 0x530 irq 10 drq 0"
-.Cd "audio* at sp?"
-.Sh DESCRIPTION
-The
-.Nm
-driver supports sound cards based on ESC614 or ESC614A ASICs and AD1848
-or CS4231 series codecs.
-Known examples are:
-.Pp
-.Bl -tag -width Ds -offset indent -compact
-.It Cardinal Digital Sound Pro 16
-.It Orchid SoundWave 32
-.El
-.Pp
-The Orchid GameWave 32 is based on the ESC614 ASIC, but not
-supported because it does not have a codec.
-.Pp
-The
-.Nm
-driver uses the Windows Sound System emulation mode of the ASIC.
-It is a half-duplex device.
-.Sh SEE ALSO
-.Xr audio 4 ,
-.Xr intro 4 ,
-.Xr isa 4 ,
-.Xr wss 4
-.Sh BUGS
-This driver doesn't work yet.
-.Pp
-The list of cards using the PSS chipset is incomplete.
-.Pp
-The ESC614 (version 1) is unable to reliably determine whether DMA
-channels are free on some motherboards.
-The ASIC determines that all channels are taken, even if that is untrue.
-When this happens, the driver cannot verify configured DMA channels with the
-ASIC's DMA autodetect hardware, so it blindly accepts the user setting.
-.Pp
-Cards based on the ESC615 ASIC are not supported.
-.Pp
-The MIDI port, joystick, and CD-ROM drive (if present) are not supported.