From f2bfe14a14bb53fdfcc83383e803daf899d1b22e Mon Sep 17 00:00:00 2001 From: Miod Vallat Date: Tue, 9 Mar 2004 22:15:06 +0000 Subject: Merge tsc and tsp, it makes no sense to scatter almost the same information. --- share/man/man4/man4.alpha/Makefile | 7 +++-- share/man/man4/man4.alpha/tsc.4 | 13 ++++++--- share/man/man4/man4.alpha/tsp.4 | 56 -------------------------------------- 3 files changed, 13 insertions(+), 63 deletions(-) delete mode 100644 share/man/man4/man4.alpha/tsp.4 (limited to 'share/man') diff --git a/share/man/man4/man4.alpha/Makefile b/share/man/man4/man4.alpha/Makefile index 590ab8f89e1..db5d87a0ad0 100644 --- a/share/man/man4/man4.alpha/Makefile +++ b/share/man/man4/man4.alpha/Makefile @@ -1,8 +1,9 @@ -# $OpenBSD: Makefile,v 1.14 2003/03/06 22:42:30 mickey Exp $ +# $OpenBSD: Makefile,v 1.15 2004/03/09 22:15:05 miod Exp $ MAN= apecs.4 asc.4 autoconf.4 cia.4 intro.4 irongate.4 \ - lca.4 le.4 mem.4 scc.4 tcasic.4 tga.4 tsc.4 tsp.4 -MLINKS= mem.4 kmem.4 + lca.4 le.4 mem.4 scc.4 tcasic.4 tga.4 tsc.4 +MLINKS= mem.4 kmem.4 \ + tsc.4 tsp.4 MANSUBDIR=alpha .include diff --git a/share/man/man4/man4.alpha/tsc.4 b/share/man/man4/man4.alpha/tsc.4 index f35d4789886..df8b9c2ffeb 100644 --- a/share/man/man4/man4.alpha/tsc.4 +++ b/share/man/man4/man4.alpha/tsc.4 @@ -1,5 +1,4 @@ -.\" $OpenBSD: tsc.4,v 1.2 2003/03/09 06:06:46 david Exp $ -.\" $NetBSD$ +.\" $OpenBSD: tsc.4,v 1.3 2004/03/09 22:15:05 miod Exp $ .\" .\" Copyright (c) 2001 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -35,7 +34,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd September 19, 2001 +.Dd March 9, 2004 .Dt TSC 4 alpha .Os .Sh NAME @@ -44,12 +43,18 @@ DECchip 21272 Core Logic chipset .Sh SYNOPSIS .Cd "tsc* at mainbus?" +.Cd "tsp* at tsc?" +.Cd "pci* at tsp?" .Sh DESCRIPTION The .Nm driver provides support for the DECchip 21272 Core Logic chipset (Tsunami) found on the 264DP OEM Board. +The +.Nm tsp +driver attaches to it and provides support for the DECchip 21272 +built-in PCI controller. .Sh SEE ALSO .Xr intro 4 , .Xr mainbus 4 , -.Xr tsp 4 +.Xr pci 4 diff --git a/share/man/man4/man4.alpha/tsp.4 b/share/man/man4/man4.alpha/tsp.4 deleted file mode 100644 index 4aa63bc449c..00000000000 --- a/share/man/man4/man4.alpha/tsp.4 +++ /dev/null @@ -1,56 +0,0 @@ -.\" $OpenBSD: tsp.4,v 1.2 2003/03/09 06:06:46 david Exp $ -.\" $NetBSD$ -.\" -.\" Copyright (c) 2001 The NetBSD Foundation, Inc. -.\" All rights reserved. -.\" -.\" This code is derived from software contributed to The NetBSD Foundation -.\" by Gregory McGarry. -.\" -.\" 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. All advertising materials mentioning features or use of this software -.\" must display the following acknowledgement: -.\" This product includes software developed by the NetBSD -.\" Foundation, Inc. and its contributors. -.\" 4. Neither the name of The NetBSD Foundation nor the names of its -.\" contributors may be used to endorse or promote products derived -.\" from this software without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS -.\" ``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 FOUNDATION OR CONTRIBUTORS -.\" 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 September 19, 2001 -.Dt TSP 4 alpha -.Os -.Sh NAME -.Nm tsp -.Nd -DECchip 21272 Core Logic chipset PCI controller -.Sh SYNOPSIS -.Cd "tsp* at tsc?" -.Cd "pci* at tsp?" -.Sh DESCRIPTION -The -.Nm -driver provides support for the PCI controller on the DECchip 21272 -Core Logic chipset. -.Sh SEE ALSO -.Xr intro 4 , -.Xr pci 4 , -.Xr tsc 4 -- cgit v1.2.3