diff options
author | dim <dim@FreeBSD.org> | 2015-07-04 21:50:39 +0000 |
---|---|---|
committer | dim <dim@FreeBSD.org> | 2015-07-04 21:50:39 +0000 |
commit | 6f44bd3256388beb23fd03fdf43ad5d53cf43e29 (patch) | |
tree | 37590f5c697f4198fdddec33c58aefdef0a5f485 /sys/dev/proto/proto_busdma.h | |
parent | cea4c167517a0678c7dbf92a0324088dcbac1035 (diff) | |
parent | 76b8ff88e56f9ad0639b7e23dd9d1128a0750026 (diff) | |
download | FreeBSD-src-6f44bd3256388beb23fd03fdf43ad5d53cf43e29.zip FreeBSD-src-6f44bd3256388beb23fd03fdf43ad5d53cf43e29.tar.gz |
Merge ^/head r284737 through r285152.
Diffstat (limited to 'sys/dev/proto/proto_busdma.h')
-rw-r--r-- | sys/dev/proto/proto_busdma.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/dev/proto/proto_busdma.h b/sys/dev/proto/proto_busdma.h index b4957f5..2b645ce 100644 --- a/sys/dev/proto/proto_busdma.h +++ b/sys/dev/proto/proto_busdma.h @@ -68,7 +68,7 @@ int proto_busdma_detach(struct proto_softc *, struct proto_busdma *); int proto_busdma_cleanup(struct proto_softc *, struct proto_busdma *); int proto_busdma_ioctl(struct proto_softc *, struct proto_busdma *, - struct proto_ioc_busdma *); + struct proto_ioc_busdma *, struct thread *); int proto_busdma_mmap_allowed(struct proto_busdma *, vm_paddr_t); |