diff options
| author | Richard Lowe <richlowe@richlowe.net> | 2011-08-28 03:26:41 +0100 |
|---|---|---|
| committer | Richard Lowe <richlowe@richlowe.net> | 2011-08-28 03:26:41 +0100 |
| commit | a998aee3ad23d3b696a5b746f105a316292befb8 (patch) | |
| tree | 4c0a05b33ddd5029c2dce5feee02042bc902c8aa /usr/src/man/man7d | |
| parent | 40c4bb03fc41bb96a590067dbc9edfc2ad829c33 (diff) | |
| parent | e1b84cb03d8fd1ef230a385429f6b768687ff944 (diff) | |
| download | illumos-joyent-a998aee3ad23d3b696a5b746f105a316292befb8.tar.gz | |
Merge branch 'master' of http://github.com/illumos/illumos-gate into gcc/upgrade
Conflicts:
usr/src/cmd/lp/cmd/lpadmin/options.c
usr/src/cmd/man/src/man.c
Diffstat (limited to 'usr/src/man/man7d')
| -rw-r--r-- | usr/src/man/man7d/si3124.7d | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/man/man7d/si3124.7d b/usr/src/man/man7d/si3124.7d index e687f12f27..739ff6d0fe 100644 --- a/usr/src/man/man7d/si3124.7d +++ b/usr/src/man/man7d/si3124.7d @@ -5,7 +5,7 @@ .\" 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 si3124 7D "17 August 2007" "SunOS 5.11" "Devices" .SH NAME -si3124 \- SiliconImage 3124/3132 SATA controller driver +si3124 \- SiliconImage 3124/3132/3531 SATA controller driver .SH SYNOPSIS .LP .nf @@ -16,7 +16,7 @@ si3124 \- SiliconImage 3124/3132 SATA controller driver .sp .LP The \fBsi3124\fR driver is a \fBSATA\fR framework-compliant HBA driver that -supports Silicon Image 3124 and 3132 \fBSATA\fR controllers. Note that while +supports Silicon Image 3124, 3132 and 3531 \fBSATA\fR controllers. Note that while the Silicon Image controllers supports standard \fBSATA\fR features including SATA-II disks, NCQ, hotplug, port multiplier and ATAPI disks, the \fBsi3124\fR driver currently does not support NCQ, port multiplier or ATAPI features. |