summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2016-02-02 22:55:03 +0000
committerjhb <jhb@FreeBSD.org>2016-02-02 22:55:03 +0000
commit8d851d4e740abae7b12ae8a5ff7e3dc1daa32a29 (patch)
treee98049758241c2b78ec8aed0b6e50e3751548b35
parent633e1868c3d57650c964455860f7fc1fc0726aa4 (diff)
downloadFreeBSD-src-8d851d4e740abae7b12ae8a5ff7e3dc1daa32a29.zip
FreeBSD-src-8d851d4e740abae7b12ae8a5ff7e3dc1daa32a29.tar.gz
- Note that devctl(8) will appear in 10.3 first.
- Add missing devctl_set_driver entry to namelist in devlist(3). - Fix sorting of function prototypes in devlist(3). MFC after: 3 days
-rw-r--r--lib/libdevctl/devctl.39
-rw-r--r--usr.sbin/devctl/devctl.84
2 files changed, 7 insertions, 6 deletions
diff --git a/lib/libdevctl/devctl.3 b/lib/libdevctl/devctl.3
index be869f9..b2734cf 100644
--- a/lib/libdevctl/devctl.3
+++ b/lib/libdevctl/devctl.3
@@ -25,7 +25,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd December 26, 2014
+.Dd February 2, 2016
.Dt DEVCTL 3
.Os
.Sh NAME
@@ -35,6 +35,7 @@
.Nm devctl_disable ,
.Nm devctl_enable ,
.Nm devctl_resume ,
+.Nm devctl_set_driver ,
.Nm devctl_suspend
.Nd device control library
.Sh LIBRARY
@@ -52,9 +53,9 @@
.Ft int
.Fn devctl_resume "const char *device"
.Ft int
-.Fn devctl_suspend "const char *device"
-.Ft int
.Fn devctl_set_driver "const char *device" "const char *driver" "bool force"
+.Ft int
+.Fn devctl_suspend "const char *device"
.Sh DESCRIPTION
The
.Nm
@@ -287,7 +288,7 @@ The new device driver failed to attach.
The
.Nm
library first appeared in
-.Fx 11.0 .
+.Fx 10.3 .
.Sh BUGS
If a device is suspended individually via
.Fn devctl_suspend
diff --git a/usr.sbin/devctl/devctl.8 b/usr.sbin/devctl/devctl.8
index fef42be..2257cb6 100644
--- a/usr.sbin/devctl/devctl.8
+++ b/usr.sbin/devctl/devctl.8
@@ -25,7 +25,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd February 5, 2015
+.Dd February 2, 2016
.Dt DEVCTL 8
.Os
.Sh NAME
@@ -134,4 +134,4 @@ the device will not be changed.
The
.Nm
utility first appeared in
-.Fx 11.0 .
+.Fx 10.3 .
OpenPOWER on IntegriCloud