Merge branch 'master' of http://github.com/illumos/illumos-gate into gcc/upgrade

Conflicts:
	usr/src/cmd/avs/dsw/iiadm.c

1 files changed, 2 insertions, 30 deletions

diff --git a/usr/src/man/man9f/csx_MakeDeviceNode.9f b/usr/src/man/man9f/csx_MakeDeviceNode.9f
index bd52f24683..1888d83c94 100644
--- a/usr/src/man/man9f/csx_MakeDeviceNode.9f
+++ b/usr/src/man/man9f/csx_MakeDeviceNode.9f
@@ -3,14 +3,14 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH csx_MakeDeviceNode 9F "19 Jul 1996" "SunOS 5.11" "Kernel Functions for Drivers"
+.TH CSX_MAKEDEVICENODE 9F "Jul 19, 1996"
 .SH NAME
 csx_MakeDeviceNode, csx_RemoveDeviceNode \- create and remove minor nodes on
 behalf of the client
 .SH SYNOPSIS
 .LP
 .nf
-#include <sys/pccard.h> 
+#include <sys/pccard.h>
 
 
 
@@ -29,23 +29,19 @@ Solaris \fBDDI \fRSpecific (Solaris \fBDDI) \fR
 .SH PARAMETERS
 .sp
 .ne 2
-.mk
 .na
 \fB\fIch\fR \fR
 .ad
 .RS 7n
-.rt  
 Client handle returned from \fBcsx_RegisterClient\fR(9F).
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fIdn\fR \fR
 .ad
 .RS 7n
-.rt  
 Pointer to a \fBmake_device_node_t\fR or \fBremove_device_node_t\fR structure.
 .RE
 
@@ -102,12 +98,10 @@ The \fBAction\fR field is used to specify the operation that
 The following \fBAction\fR values are defined for \fBcsx_MakeDeviceNode()\fR:
 .sp
 .ne 2
-.mk
 .na
 \fBCREATE_DEVICE_NODE\fR
 .ad
 .RS 22n
-.rt  
 Create \fBNumDevNodes\fR minor nodes
 .RE
 
@@ -116,23 +110,19 @@ Create \fBNumDevNodes\fR minor nodes
 The following \fBAction\fR values are defined for \fBcsx_RemoveDeviceNode()\fR:
 .sp
 .ne 2
-.mk
 .na
 \fBREMOVE_DEVICE_NODE\fR
 .ad
 .RS 27n
-.rt  
 Remove \fBNumDevNodes\fR minor nodes
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fBREMOVE_ALL_DEVICE_NODES\fR
 .ad
 .RS 27n
-.rt  
 Remove all minor nodes for this client
 .RE
 
@@ -141,12 +131,10 @@ Remove all minor nodes for this client
 For \fBcsx_MakeDeviceNode()\fR, if the \fBAction\fR field is:
 .sp
 .ne 2
-.mk
 .na
 \fB\fBCREATE_DEVICE_NODE\fR \fR
 .ad
 .RS 23n
-.rt  
 The \fBNumDevNodes\fR field must be set to the number of minor devices to
 create, and the client must allocate the quantity of \fBdevnode_desc_t\fR
 structures specified by \fBNumDevNodes\fR and fill out the fields in the
@@ -161,12 +149,10 @@ the parameters of the same name to the \fBddi_create_minor_node\fR(9F) \fBDDI
 For \fBcsx_RemoveDeviceNode()\fR, if the \fBAction\fR field is:
 .sp
 .ne 2
-.mk
 .na
 \fB\fBREMOVE_DEVICE_NODE\fR \fR
 .ad
 .RS 28n
-.rt  
 The \fBNumDevNodes\fR field must be set to the number of minor devices to
 remove, and the client must allocate the quantity of \fBdevnode_desc_t\fR
 structures specified by \fBNumDevNodes\fR and fill out the fields in the
@@ -178,12 +164,10 @@ the parameters of the same name to the \fBddi_remove_minor_node\fR(9F) \fBDDI
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBREMOVE_ALL_DEVICE_NODES\fR \fR
 .ad
 .RS 28n
-.rt  
 The \fBNumDevNodes\fR field must be set to \fB0\fR and the \fBdevnode_desc_t\fR
 structure pointer must be set to \fINULL\fR. All device nodes for this client
 will be removed from the filesystem.
@@ -192,67 +176,55 @@ will be removed from the filesystem.
 .SH RETURN VALUES
 .sp
 .ne 2
-.mk
 .na
 \fB\fBCS_SUCCESS\fR \fR
 .ad
 .RS 28n
-.rt  
 Successful operation.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBCS_BAD_HANDLE\fR \fR
 .ad
 .RS 28n
-.rt  
 Client handle is invalid.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBCS_BAD_ATTRIBUTE\fR \fR
 .ad
 .RS 28n
-.rt  
 The value of one or more arguments is invalid.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBCS_BAD_ARGS\fR \fR
 .ad
 .RS 28n
-.rt  
 Action is invalid.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBCS_OUT_OF_RESOURCE\fR \fR
 .ad
 .RS 28n
-.rt  
 Unable to create or remove device node.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBCS_UNSUPPORTED_FUNCTION\fR \fR
 .ad
 .RS 28n
-.rt  
 No \fBPCMCIA \fRhardware installed.
 .RE