summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorru <ru@FreeBSD.org>2004-07-03 22:53:50 +0000
committerru <ru@FreeBSD.org>2004-07-03 22:53:50 +0000
commitc79648de844d194c9b9b2f7aadb68bcee74a9192 (patch)
tree9e3fd2e88cd548e4aca100c668d74175a7dfa0d5
parent57ce50860e81c55913c3e3d59255c73bef88ba12 (diff)
downloadFreeBSD-src-c79648de844d194c9b9b2f7aadb68bcee74a9192.zip
FreeBSD-src-c79648de844d194c9b9b2f7aadb68bcee74a9192.tar.gz
Merge junk.
-rw-r--r--share/man/man9/utopia.97
1 files changed, 1 insertions, 6 deletions
diff --git a/share/man/man9/utopia.9 b/share/man/man9/utopia.9
index f35fca6..170eebc 100644
--- a/share/man/man9/utopia.9
+++ b/share/man/man9/utopia.9
@@ -230,14 +230,9 @@ Twisted pair diagnostic loopback.
Diagnostic path loopback.
.El
.It Va chip
-<<<<<<< utopia.9
This points the a function vector for chip specific functions.
Two fields
-in this vector a publically available:
-=======
-This points the a function vector for chip specific functions. Two fields
-in this vector are publicly available:
->>>>>>> 1.3
+in this vector are publically available:
.Bl -tag -width XXX
.It Va type
This is the type of the detected PHY chip.
OpenPOWER on IntegriCloud