diff options
| author | rwatson <rwatson@FreeBSD.org> | 2015-03-19 13:37:36 +0000 |
|---|---|---|
| committer | rwatson <rwatson@FreeBSD.org> | 2015-03-19 13:37:36 +0000 |
| commit | 6102a34d3875e6b3f22e0245d7698fe549c674a1 (patch) | |
| tree | df3b1e38c02357cff6357a78741ce42d4959b672 /sys/dev/iscsi | |
| parent | 24836ef695b4d0b47117fe6ed0d34b16e37a68aa (diff) | |
| download | FreeBSD-src-6102a34d3875e6b3f22e0245d7698fe549c674a1.zip FreeBSD-src-6102a34d3875e6b3f22e0245d7698fe549c674a1.tar.gz | |
Merge r263233 from HEAD to stable/10:
Update kernel inclusions of capability.h to use capsicum.h instead; some
further refinement is required as some device drivers intended to be
portable over FreeBSD versions rely on __FreeBSD_version to decide whether
to include capability.h.
Sponsored by: Google, Inc.
Diffstat (limited to 'sys/dev/iscsi')
| -rw-r--r-- | sys/dev/iscsi/icl.c | 2 | ||||
| -rw-r--r-- | sys/dev/iscsi/icl_proxy.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/iscsi/icl.c b/sys/dev/iscsi/icl.c index bb2c983..7b085bd 100644 --- a/sys/dev/iscsi/icl.c +++ b/sys/dev/iscsi/icl.c @@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/condvar.h> #include <sys/conf.h> #include <sys/file.h> diff --git a/sys/dev/iscsi/icl_proxy.c b/sys/dev/iscsi/icl_proxy.c index e014568..3a8db66 100644 --- a/sys/dev/iscsi/icl_proxy.c +++ b/sys/dev/iscsi/icl_proxy.c @@ -71,7 +71,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/condvar.h> #include <sys/conf.h> #include <sys/kernel.h> |
